Tweak how queue restarting works.
Merge branch '4.2' into schema_migration_status