Turn ObjectStoreLocationProvider off by default
#1722
Merged
ObjectStoreLocationProvider off by default
#1722