OAK-1856 - Enable specifying of OSGi config via JSON file and in memory map

Fix test failures

git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/oak/trunk@1597748 13f79535-47bb-0310-9956-ffa450edef68
OAK-1676 - NodeStoreServices nondeterministic with customBlobStore

blobStores would now only be used when customBlobStore is set to true

git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/oak/trunk@1597751 13f79535-47bb-0310-9956-ffa450edef68