Turn ObjectStoreLocationProvider off by default
#1722
+13
−8
Merged