Merge branch 'fix_some_random_failures' into 'master'

Fix some random failures

See merge request !10142

spec/features/merge_requests/merge_immediately_with_pipeline_spec.rb

@@ -35,6 +35,8 @@ feature 'Merge immediately', :feature, :js do
         click_link 'Merge Immediately'
 
         expect(find('.js-merge-when-pipeline-succeeds-button')).to have_content('Merge in progress')
+
+        wait_for_ajax
       end
     end
   end