CE upstream - 2018-02-22 15:26 UTC

Closes #4975 and gitlab-com/infrastructure#3734

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