JBTM-2207 Updated a couple of references to the default object store