CE upstream - 2018-12-07 02:38 UTC

Closes gitlab-ce#54729, gitlab-ce#52607, #2745, and gitlab-ce#54718

See merge request gitlab-org/gitlab-ee!8746