Port changes from gitlab-org/gitlab-ee!4064 to CE (!16796) · Merge requests · GitLab.org / GitLab FOSS · GitLab

Rémy Coutable requested to merge rc/port-ee-4064 into master Jan 30, 2018

What does this MR do?

Upstream port of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4064 to CE (minus the Geo test changes).

Does this MR meet the acceptance criteria?

Review
- Has been reviewed by Backend
Conform by the merge request performance guides
Conform by the style guides
Squashed related commits together