Merge branch 'fix-es-migration' into ce-to-ee-wednesday

db/migrate/20170215151540_migrate_old_elasticsearch_settings.rb

@@ -28,7 +28,7 @@ class MigrateOldElasticsearchSettings < ActiveRecord::Migration
           .set(settings[:elasticsearch_url] => urls.join(','))
           .where(settings[:id].eq(id))
 
-      connection.exec_update(updater.to_sql)
+      connection.exec_update(updater.to_sql, self.class.name, [])
     end
   end