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