CE upstream - 2018-10-20 00:21 UTC

Closes gitlab-ce#52916, gitlab-ce#52918, gitlab-runner#3642 et #8062

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