EE port of gitlab-org/gitlab-ce!26058 which resolves a minor conflict within Gemfile.lock
Gemfile.lock