CE upstream - 2018-03-23 06:25 UTC

Closes charts/helm.gitlab.io#291 and gitlab-ce#43937

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