Merge branch 'sh-make-qa-gems-consistent' into 'master'
Update gems in Gemfile and qa/Gemfile to be consistent See merge request gitlab-org/gitlab-ce!24112
Update gems in Gemfile and qa/Gemfile to be consistent See merge request gitlab-org/gitlab-ce!24112