[EE] Pick 10.4.3 fixes into master
CE: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/17040
@ibaum @markglenfletcher It's important these go into the next RC.
Edited by Robert Speicher
CE: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/17040
@ibaum @markglenfletcher It's important these go into the next RC.