Merge branch 'ce-to-ee-2018-01-22' into 'master'

CE upstream - Monday

See merge request gitlab-org/gitlab-ee!4179

qa/qa/page/main/login.rb

@@ -19,6 +19,7 @@ module QA
         end
 
         def sign_in_using_credentials
+          using_wait_time 0 do
             if page.has_content?('Change your password')
               fill_in :user_password, with: Runtime::User.password
               fill_in :user_password_confirmation, with: Runtime::User.password
@@ -29,6 +30,7 @@ module QA
             fill_in :user_password, with: Runtime::User.password
             click_button 'Sign in'
           end
+        end
 
         def self.path
           '/users/sign_in'