Merge branch 'qa-257-group-saml-sso-ce-pre-req' into 'master'

Adds css classes to aid GitLab-QA tests

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

app/views/layouts/nav/sidebar/_group.html.haml

@@ -109,7 +109,7 @@
           = link_to edit_group_path(@group) do
             .nav-icon-container
               = sprite_icon('settings')
-            %span.nav-item-name
+            %span.nav-item-name.qa-settings-item
               = _('Settings')
           %ul.sidebar-sub-level-items
             = nav_link(path: %w[groups#projects groups#edit badges#index ci_cd#show], html_options: { class: "fly-out-top-item" } ) do