Merge 10-6-stable-ee-frozen into 10-6-stable-ee (!2364) · Merge requests · GitLab.org / omnibus-gitlab · GitLab

DJ Mountney requested to merge 10-6-stable-ee-frozen into 10-6-stable-ee Mar 12, 2018

EE version of !2363 (merged)

cc\ @rspeicher @jameslopez