Merge branch 'ml-fix-initial-admin-password' into 'master'

QA: Fix: set initial password even if using admin credentials

See merge request gitlab-org/gitlab-ce!21785

qa/qa/page/main/login.rb

@@ -66,6 +66,8 @@ module QA
           end
 
           using_wait_time 0 do
+            set_initial_password_if_present
+
             sign_in_using_gitlab_credentials(admin)
           end