CE upstream - 2018-07-05 12:27 UTC

Closes charts/gitlab#565 and #4266

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