diff --git a/core/lib/Drupal/Core/CoreBundle.php b/core/lib/Drupal/Core/CoreBundle.php
index 91a7d01..7bf66f1 100644
--- a/core/lib/Drupal/Core/CoreBundle.php
+++ b/core/lib/Drupal/Core/CoreBundle.php
@@ -43,10 +43,6 @@ public function build(ContainerBuilder $container) {
     $container
       ->register('config.cachedstorage.storage', 'Drupal\Core\Config\FileStorage')
       ->addArgument(config_get_config_directory(CONFIG_ACTIVE_DIRECTORY));
-    $container
-      ->register('config.storage', 'Drupal\Core\Config\CachedStorage')
-      ->addArgument(new Reference('config.cachedstorage.storage'))
-      ->addArgument(new Reference('cache.config'));
 
     $container->register('config.context.factory', 'Drupal\Core\Config\Context\ConfigContextFactory')
       ->addArgument(new Reference('event_dispatcher'));
diff --git a/core/lib/Drupal/Core/CoreBundle.yml b/core/lib/Drupal/Core/CoreBundle.yml
new file mode 100644
index 0000000..71b28ad
--- /dev/null
+++ b/core/lib/Drupal/Core/CoreBundle.yml
@@ -0,0 +1,6 @@
+services:
+    config.storage:
+        class: Drupal\Core\Config\CachedStorage
+        arguments:
+            - '@config.cachedstorage.storage'
+            - '@cache.config'
diff --git a/core/lib/Drupal/Core/DependencyInjection/YamlFileLoader.php b/core/lib/Drupal/Core/DependencyInjection/YamlFileLoader.php
new file mode 100644
index 0000000..df24c16
--- /dev/null
+++ b/core/lib/Drupal/Core/DependencyInjection/YamlFileLoader.php
@@ -0,0 +1,236 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Core\DependencyInjection\YamlFileLoader.
+ */
+
+namespace Drupal\Core\DependencyInjection;
+
+use Symfony\Component\DependencyInjection\Alias;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\DependencyInjection\DefinitionDecorator;
+use Symfony\Component\DependencyInjection\Reference;
+use Symfony\Component\Yaml\Parser;
+use Symfony\Component\Yaml\Yaml;
+
+/**
+ * Drupal does not use Symfony's Config component, so this is a partial of the
+ * \Symfony\Component\DependencyInjection\Loader\YamlFileLoade class not
+ * depending on the Config component.
+ */
+class YamlFileLoader {
+
+  /**
+   * @param \Drupal\Core\DependencyInjection\ContainerBuilder $container
+   */
+  protected $container;
+
+  public function __construct(ContainerBuilder $container) {
+    $this->container = $container;
+  }
+  
+  public function load($filename) {
+    $content = $this->loadFile($filename);
+    $content += array('parameters' => array(), 'services' => array());
+    // parameters
+    foreach ($content['parameters'] as $key => $value) {
+      $this->container->setParameter($key, $this->resolveServices($value));
+    }
+    // services
+    foreach ($content['services'] as $id => $service) {
+      $this->parseDefinition($id, $service, $filename);
+    }
+  }
+
+  /**
+   * Parses a definition.
+   *
+   * Copied from \Symfony\Component\DependencyInjection\Loader\YamlFileLoader::parseDefinition().
+   *
+   * @param string $id
+   * @param array  $service
+   * @param string $filename
+   *
+   * @throws \InvalidArgumentException When tags are invalid
+   */
+  protected function parseDefinition($id, $service, $filename) {
+    if (is_string($service) && 0 === strpos($service, '@')) {
+      $this->container->setAlias($id, substr($service, 1));
+      return;
+    }
+    elseif (isset($service['alias'])) {
+      $public = !array_key_exists('public', $service) || (Boolean) $service['public'];
+      $this->container->setAlias($id, new Alias($service['alias'], $public));
+      return;
+    }
+    if (isset($service['parent'])) {
+      $definition = new DefinitionDecorator($service['parent']);
+    }
+    else {
+      $definition = new Definition();
+    }
+
+    if (isset($service['class'])) {
+      $definition->setClass($service['class']);
+    }
+
+    if (isset($service['scope'])) {
+      $definition->setScope($service['scope']);
+    }
+
+    if (isset($service['synthetic'])) {
+      $definition->setSynthetic($service['synthetic']);
+    }
+
+    if (isset($service['public'])) {
+      $definition->setPublic($service['public']);
+    }
+
+    if (isset($service['abstract'])) {
+      $definition->setAbstract($service['abstract']);
+    }
+
+    if (isset($service['factory_class'])) {
+      $definition->setFactoryClass($service['factory_class']);
+    }
+
+    if (isset($service['factory_method'])) {
+      $definition->setFactoryMethod($service['factory_method']);
+    }
+
+    if (isset($service['factory_service'])) {
+      $definition->setFactoryService($service['factory_service']);
+    }
+
+    if (isset($service['file'])) {
+      $definition->setFile($service['file']);
+    }
+
+    if (isset($service['arguments'])) {
+      $definition->setArguments($this->resolveServices($service['arguments']));
+    }
+
+    if (isset($service['properties'])) {
+      $definition->setProperties($this->resolveServices($service['properties']));
+    }
+
+    if (isset($service['configurator'])) {
+      if (is_string($service['configurator'])) {
+        $definition->setConfigurator($service['configurator']);
+      }
+      else {
+        $definition->setConfigurator(array($this->resolveServices($service['configurator'][0]), $service['configurator'][1]));
+      }
+    }
+
+    if (isset($service['calls'])) {
+      foreach ($service['calls'] as $call) {
+        $args = isset($call[1]) ? $this->resolveServices($call[1]) : array();
+        $definition->addMethodCall($call[0], $args);
+      }
+    }
+
+    if (isset($service['tags'])) {
+      if (!is_array($service['tags'])) {
+        throw new \InvalidArgumentException(sprintf('Parameter "tags" must be an array for service "%s" in %s.', $id, $filename));
+      }
+
+      foreach ($service['tags'] as $tag) {
+        if (!isset($tag['name'])) {
+          throw new \InvalidArgumentException(sprintf('A "tags" entry is missing a "name" key for service "%s" in %s.', $id, $filename));
+        }
+
+        $name = $tag['name'];
+        unset($tag['name']);
+
+        foreach ($tag as $value) {
+          if (!is_scalar($value)) {
+            throw new \InvalidArgumentException(sprintf('A "tags" attribute must be of a scalar-type for service "%s", tag "%s" in %s.', $id, $name, $filename));
+          }
+        }
+
+        $definition->addTag($name, $tag);
+      }
+    }
+
+    $this->container->setDefinition($id, $definition);
+  }
+
+  /**
+   * Loads a YAML file.
+   *
+   * @param string ,$filename
+   *
+   * @return array The file content
+   */
+  protected function loadFile($filename) {
+    $parser = new Parser();
+    return $this->validate($parser->parse(file_get_contents($filename)), $filename);
+  }
+
+  /**
+   * Validates a YAML file.
+   *
+   * @param mixed  $content
+   * @param string $filename
+   *
+   * @return array
+   *
+   * @throws \InvalidArgumentException When service file is not valid
+   */
+  protected function validate($content, $filename) {
+    if (NULL === $content) {
+      return $content;
+    }
+
+    if (!is_array($content)) {
+      throw new \InvalidArgumentException(sprintf('The service file "%s" is not valid: it is not an array.', $filename));
+    }
+    if ($keys = array_diff_key($content, array('parameters' => TRUE, 'services' => TRUE))) {
+      $invalid_keys = htmlspecialchars(implode(', ', $keys), ENT_QUOTES, 'UTF-8');
+      throw new \InvalidArgumentException(sprintf('The service file "%s" is not valid: it contains invalid keys %s.', $filename, $invalid_keys));
+    }
+
+    return $content;
+  }
+
+  /**
+   * Resolves services.
+   *
+   * Copied from \Symfony\Component\DependencyInjection\Loader\YamlFileLoader::parseDefinition().
+   *
+   * @param string $value
+   *
+   * @return Reference
+   */
+  protected function resolveServices($value) {
+    if (is_array($value)) {
+      $value = array_map(array($this, 'resolveServices'), $value);
+    }
+    elseif (is_string($value) && 0 === strpos($value, '@')) {
+      if (0 === strpos($value, '@?')) {
+        $value = substr($value, 2);
+        $invalidBehavior = ContainerInterface::IGNORE_ON_INVALID_REFERENCE;
+      }
+      else {
+        $value = substr($value, 1);
+        $invalidBehavior = ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE;
+      }
+
+      if ('=' === substr($value, -1)) {
+        $value = substr($value, 0, -1);
+        $strict = FALSE;
+      }
+      else {
+        $strict = TRUE;
+      }
+
+      $value = new Reference($value, $invalidBehavior, $strict);
+    }
+
+    return $value;
+  }
+
+}
diff --git a/core/lib/Drupal/Core/DrupalKernel.php b/core/lib/Drupal/Core/DrupalKernel.php
index ee14fb3..167782f 100644
--- a/core/lib/Drupal/Core/DrupalKernel.php
+++ b/core/lib/Drupal/Core/DrupalKernel.php
@@ -11,6 +11,7 @@
 use Drupal\Core\Config\BootstrapConfigStorageFactory;
 use Drupal\Core\CoreBundle;
 use Drupal\Core\DependencyInjection\ContainerBuilder;
+use Drupal\Core\DependencyInjection\YamlFileLoader;
 use Symfony\Component\ClassLoader\UniversalClassLoader;
 use Symfony\Component\Config\Loader\LoaderInterface;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
@@ -100,6 +101,13 @@ class DrupalKernel extends Kernel implements DrupalKernelInterface {
   protected $containerNeedsDumping;
 
   /**
+   * Holds the list of YAML files containing service definitions.
+   *
+   * @var array
+   */
+  protected $bundleYamls;
+
+  /**
    * Constructs a DrupalKernel object.
    *
    * @param string $environment
@@ -160,6 +168,9 @@ public function registerBundles() {
     $bundles = array(
       new CoreBundle(),
     );
+    $this->bundleYamls = array(
+      'core/lib/Drupal/Core/CoreBundle.yml'
+    );
     $this->bundleClasses = array('Drupal\Core\CoreBundle');
 
     // Ensure we know what modules are enabled and that their namespaces are
@@ -168,7 +179,8 @@ public function registerBundles() {
       $module_list = $this->configStorage->read('system.module');
       $this->moduleList = isset($module_list['enabled']) ? $module_list['enabled'] : array();
     }
-    $this->registerNamespaces($this->getModuleNamespaces($this->getModuleFileNames()));
+    $namespace_directories = $this->getModuleNamespaces($this->getModuleFileNames());
+    $this->registerNamespaces($namespace_directories);
 
     // Load each module's bundle class.
     foreach ($this->moduleList as $module => $weight) {
@@ -178,6 +190,10 @@ public function registerBundles() {
         $bundles[] = new $class();
         $this->bundleClasses[] = $class;
       }
+      $filename = $namespace_directories["Drupal\\$module"] . "/Drupal/$module/{$camelized}Bundle.yml";
+      if (file_exists($filename)) {
+        $this->bundleYamls[] = $filename;
+      }
     }
 
     // Add site specific or test bundles.
@@ -382,6 +398,10 @@ protected function buildContainer() {
     foreach ($this->bundles as $bundle) {
       $bundle->build($container);
     }
+    $yaml_loader = new YamlFileLoader($container);
+    foreach ($this->bundleYamls as $filename) {
+      $yaml_loader->load($filename);
+    }
     $container->setParameter('persistIds', array_keys($container->findTaggedServiceIds('persist')));
     $container->compile();
     return $container;
diff --git a/core/modules/system/system.install b/core/modules/system/system.install
index a93a124..abc1aac 100644
--- a/core/modules/system/system.install
+++ b/core/modules/system/system.install
@@ -2015,7 +2015,7 @@ function system_update_8046() {
     $module_list = drupal_container()->getParameter('container.modules');
     drupal_load('module', 'views');
 
-    drupal_container()->get('kernel')->updateModules(array_keys($module_list), array('views' => 'core/modules/views/views.module'));
+    drupal_container()->get('kernel')->updateModules($module_list, array('views' => 'core/modules/views/views.module'));
 
     // This does not fire a hook just calls views.
     config_install_default_config('module', 'views');