diff -u b/core/lib/Drupal/Core/DrupalKernel.php b/core/lib/Drupal/Core/DrupalKernel.php
--- b/core/lib/Drupal/Core/DrupalKernel.php
+++ b/core/lib/Drupal/Core/DrupalKernel.php
@@ -64,11 +64,6 @@
    */
   protected function initializeContainer() {
     $class = $this->getContainerClass();
-    $class_original = $class;
-    $prefix = 0;
-    while (class_exists($class)) {
-      $class = $class_original . $prefix++;
-    }
     $cache_file = $class . '.php';
 
     $storage = drupal_php_storage('service_container');
@@ -86,6 +81,21 @@
   }
 
   /**
+   * Gets the container class.
+   *
+   * @return string
+   */
+  protected function getContainerClass() {
+    $class = parent::getContainerClass();
+    $class_original = $class;
+    $prefix = 0;
+    while (class_exists($class)) {
+      $class = $class_original . $prefix++;
+    }
+    return $class;
+  }
+
+  /**
    * Builds the service container.
    *
    * @return ContainerBuilder The compiled service container
only in patch2:
unchanged:
--- a/core/includes/file.inc
+++ b/core/includes/file.inc
@@ -2025,7 +2025,7 @@ function file_scan_directory($dir, $mask, $options = array(), $depth = 0) {
 
   $options['key'] = in_array($options['key'], array('uri', 'filename', 'name')) ? $options['key'] : 'uri';
   $files = array();
-  if (is_dir($dir) && $handle = opendir($dir)) {
+  if (is_dir($dir) && $handle = @opendir($dir)) {
     while (FALSE !== ($filename = readdir($handle))) {
       if (!preg_match($options['nomask'], $filename) && $filename[0] != '.') {
         $uri = "$dir/$filename";