Merge branch 'qa-staging-59-fix-project-template-spec-ce' into 'master'

CE port of "Fix project template spec"

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

qa/qa/page/settings/common.rb

@@ -11,7 +11,7 @@ module QA
           within_element(element_name) do
             # Because it is possible to click the button before the JS toggle code is bound
             wait(reload: false) do
-              click_button 'Expand' unless first('button', text: 'Collapse')
+              click_button 'Expand' unless has_css?('button', text: 'Collapse')
 
               has_content?('Collapse')
             end