diff --git a/core/includes/config.inc b/core/includes/config.inc
index 0b83f60..7e9283d 100644
--- a/core/includes/config.inc
+++ b/core/includes/config.inc
@@ -30,7 +30,9 @@ function config_install_default_config($type, $name) {
     config('manifest.' . $entity_info['config_prefix'])->save();
   }
 
-  $config_dir = drupal_get_path($type, $name) . '/config';
+  $extension_dir = drupal_get_path($type, $name);
+  $extension_info = drupal_parse_info_file($extension_dir . "/$name.info");
+  $config_dir = $extension_dir . '/' . (isset($extension_info['config']) ? $extension_info['config'] : 'config')
   if (is_dir($config_dir)) {
     $source_storage = new FileStorage($config_dir);
     $target_storage = drupal_container()->get('config.storage');
diff --git a/sites/default/default.settings.php b/sites/default/default.settings.php
old mode 100644
new mode 100755