Index: oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/BlobStoreConfiguration.java
===================================================================
--- oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/BlobStoreConfiguration.java	(revision 1572445)
+++ oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/BlobStoreConfiguration.java	(working copy)
@@ -141,10 +141,9 @@
     public BlobStoreConfiguration loadFromContextOrMap(Map<String, ?> map, BundleContext context) {
         loadFromMap(map);
 
-        Map<String, Object> contextMap = Maps.newHashMap();
         for (String key : getPropKeys()) {
             if (context.getProperty(key) != null) {
-                contextMap.put(key, context.getProperty(key));
+                configMap.put(key, context.getProperty(key));
             }
         }
         return this;
Index: oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java
===================================================================
--- oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java	(revision 1572445)
+++ oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java	(working copy)
@@ -116,7 +116,9 @@
         int offHeapCache = PropertiesUtil.toInteger(prop(config, PROP_OFF_HEAP_CACHE), DEFAULT_OFF_HEAP_CACHE);
         int cacheSize = PropertiesUtil.toInteger(prop(config, PROP_CACHE), DEFAULT_CACHE);
         boolean useMK = PropertiesUtil.toBoolean(config.get(PROP_USE_MK), false);
-        String blobStoreType = PropertiesUtil.toString(config.get(BlobStoreConfiguration.PROP_BLOB_STORE_PROVIDER),
+        String blobStoreType = PropertiesUtil.toString(
+                prop(config, BlobStoreConfiguration.PROP_BLOB_STORE_PROVIDER, 
+                        BlobStoreConfiguration.PROP_BLOB_STORE_PROVIDER),
                 BlobStoreConfiguration.DEFAULT_BLOB_STORE_PROVIDER);
 
         MongoClientOptions.Builder builder = MongoConnection.getDefaultBuilder();
@@ -137,11 +139,13 @@
         // Check if any valid external BlobStore is defined.
         // If not then use the default which is MongoBlobStore
         BlobStore blobStore = null;
-        if (Strings.isNullOrEmpty(blobStoreType)) {
+        if (!Strings.isNullOrEmpty(blobStoreType)) {
             blobStore = BlobStoreHelper.create(
                     BlobStoreConfiguration.newInstance().
                             loadFromContextOrMap(config, context))
                     .orNull();
+            logger.info("BlobStore Configured {}", blobStore);
+
         }
 
         DocumentMK.Builder mkBuilder =