Disables IoQueue temporarily from the batch importer
Actually enables it for tests
Handling of exceptional conditions during HA upgrade
Merge remote-tracking branch 'upstream/2.1-maint' into 2.1-ha-upgrade