only in patch2:
unchanged:
--- a/core/includes/bootstrap.inc
+++ b/core/includes/bootstrap.inc
@@ -1752,9 +1752,6 @@ function _drupal_bootstrap_configuration() {
   // Detect string handling method.
   Unicode::check();
 
-  // Load the procedural configuration system helper functions.
-  require_once __DIR__ . '/config.inc';
-
   // Set the Drupal custom error handler. (requires \Drupal::config())
   set_error_handler('_drupal_error_handler');
   set_exception_handler('_drupal_exception_handler');
only in patch2:
unchanged:
--- a/core/includes/config.inc
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-/**
- * @file
- * This is the API for configuration storage.
- */
-
-/**
- * Gets configuration object names starting with a given prefix.
- *
- * @deprecated Deprecated since Drupal 8.x-dev, to be removed in Drupal 8.0.
- *   Use \Drupal::configFactory()->listAll() instead.
- */
-function config_get_storage_names_with_prefix($prefix = '') {
-  return \Drupal::configFactory()->listAll($prefix);
-}
-
-/**
- * Retrieves a configuration object.
- *
- * This is the main entry point to the configuration API. Calling
- * @code \Drupal::config('book.admin') @endcode will return a configuration
- * object in which the book module can store its administrative settings.
- *
- * @deprecated Deprecated since Drupal 8.x-dev, to be removed in Drupal 8.0.
- *   Use \Drupal::config() instead.
- *
- * @param string $name
- *   The name of the configuration object to retrieve. The name corresponds to
- *   a configuration file. For @code \Drupal::config('book.admin') @endcode, the
- *   config object returned will contain the contents of book.admin
- *   configuration file.
- *
- * @return \Drupal\Core\Config\Config
- *   A configuration object.
- */
-function config($name) {
-  return \Drupal::config($name);
-}
-
-/**
- * Returns the typed config manager service.
- *
- * Use the typed data manager service for creating typed configuration objects.
- *
- * @deprecated Deprecated since Drupal 8.x-dev, to be removed in Drupal 8.0.
- *   Use \Drupal::service('config.typed') instead.
- *
- * @see \Drupal\Core\TypedData\TypedDataManager::create()
- *
- * @return \Drupal\Core\Config\TypedConfigManager
- */
-function config_typed() {
-  return \Drupal::service('config.typed');
-}
-
only in patch2:
unchanged:
--- a/core/modules/field_ui/lib/Drupal/field_ui/DisplayOverview.php
+++ b/core/modules/field_ui/lib/Drupal/field_ui/DisplayOverview.php
@@ -28,7 +28,8 @@ public static function create(ContainerInterface $container) {
     return new static(
       $container->get('entity.manager'),
       $container->get('plugin.manager.field.field_type'),
-      $container->get('plugin.manager.field.formatter')
+      $container->get('plugin.manager.field.formatter'),
+      $container->get('config.factory')
     );
   }
 
only in patch2:
unchanged:
--- a/core/modules/field_ui/lib/Drupal/field_ui/FormDisplayOverview.php
+++ b/core/modules/field_ui/lib/Drupal/field_ui/FormDisplayOverview.php
@@ -28,7 +28,8 @@ public static function create(ContainerInterface $container) {
     return new static(
       $container->get('entity.manager'),
       $container->get('plugin.manager.field.field_type'),
-      $container->get('plugin.manager.field.widget')
+      $container->get('plugin.manager.field.widget'),
+      $container->get('config.factory')
     );
   }