batched_store default settings are now defaults in all tests too
Merge remote-tracking branch 'refs/remotes/origin/batched-store-defaults' into 1.6