Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-07-25

# Conflicts:
#	db/migrate/20180503193542_add_indexes_to_remote_mirror.rb

[ci skip]

db/migrate/20180503193542_add_indexes_to_remote_mirror.rb

@@ -10,7 +10,10 @@ class AddIndexesToRemoteMirror < ActiveRecord::Migration
   end
 
   def down
+<<<<<<< HEAD
     # ee/db/migrate/20170208144550_add_index_to_mirrors_last_update_at_fields.rb will remove the index.
+=======
+>>>>>>> upstream/master
     # rubocop:disable Migration/RemoveIndex
     remove_index :remote_mirrors, :last_successful_update_at if index_exists? :remote_mirrors, :last_successful_update_at
   end