Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-10-15
GitLab Bot authored
# Conflicts:
#	app/services/clusters/create_service.rb
#	locale/gitlab.pot
#	spec/requests/api/settings_spec.rb

[ci skip]
24f22fa2