CE upstream: Pre-9.4 RC1

Running a second upstream merge for Friday, July 7th 2017 to keep up with latest changes prior to creating 9-4-stable branch

Conflicts to fix:

• app/assets/stylesheets/new_sidebar.scss
• app/assets/stylesheets/pages/issuable.scss
• app/controllers/projects/milestones_controller.rb
• app/controllers/projects/variables_controller.rb
• app/finders/users_finder.rb
• app/models/ci/variable.rb
• app/models/issue.rb
• app/models/milestone.rb
• app/models/user.rb
• app/views/ci/variables/_form.html.haml
• app/views/groups/_settings_head.html.haml
• app/views/shared/members/_member.html.haml
• config/application.rb
• db/schema.rb
• spec/finders/users_finder_spec.rb
• spec/requests/api/users_spec.rb
• spec/services/merge_requests/refresh_service_spec.rb

Update 2017-7-10

I merged the CE master branch at the point where 9-4-stable was created and the following conflicts were introduced:

• spec/features/boards/boards_spec.rb
• spec/features/issues/create_issue_for_single_discussion_in_merge_request_spec.rb
• spec/features/issues/user_uses_slash_commands_spec.rb
• spec/features/merge_requests/edit_mr_spec.rb
• spec/features/milestones/show_spec.rb
• spec/features/protected_tags_spec.rb