Merge branch 'zj-disable-timeout-migration' into 'master'

Disable timeout while removing services

Closes #25976

See merge request !8322

db/post_migrate/20161221140236_remove_unneeded_services.rb

@@ -4,6 +4,8 @@ class RemoveUnneededServices < ActiveRecord::Migration
   DOWNTIME = false
   def up
+    disable_statement_timeout
+
     execute("DELETE FROM services WHERE active = false AND properties = '{}';")
   end