CE upstream - 2018-05-30 15:02 UTC

Closes #6045, #2678, and omnibus-gitlab#2138

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