CE upstream - 2018-12-05 21:21 UTC

Closes gitlab-ce#54868, gitlab-ce#50662, and #8195

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