diff --git a/core/lib/Drupal/Core/Config/ConfigImporter.php b/core/lib/Drupal/Core/Config/ConfigImporter.php
index ba2ece6..5538318 100644
--- a/core/lib/Drupal/Core/Config/ConfigImporter.php
+++ b/core/lib/Drupal/Core/Config/ConfigImporter.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\Core\Config;
 
+use Drupal\Component\Utility\String;
 use Drupal\Core\Config\Context\FreeConfigContext;
 use Drupal\Core\Entity\EntityManager;
 use Drupal\Core\Lock\LockBackendInterface;
@@ -47,6 +48,13 @@ class ConfigImporter {
   protected $storageComparer;
 
   /**
+   * The storage comparer used to discover local configuration changes.
+   *
+   * @var \Drupal\Core\Config\StorageComparerInterface
+   */
+  protected $localComparer;
+
+  /**
    * The event dispatcher used to notify subscribers.
    *
    * @var \Symfony\Component\EventDispatcher\EventDispatcher
@@ -106,7 +114,7 @@ class ConfigImporter {
    * Constructs a configuration import object.
    *
    * @param \Drupal\Core\Config\StorageComparerInterface $storage_comparer
-   *   A storage comparer object used to determin configuration changes and
+   *   A storage comparer object used to determine configuration changes and
    *   access the source and target storage objects.
    * @param \Symfony\Component\EventDispatcher\EventDispatcherInterface $event_dispatcher
    *   The event dispatcher used to notify subscribers of config import events.
@@ -114,18 +122,21 @@ class ConfigImporter {
    *   The config factory that statically caches config objects.
    * @param \Drupal\Core\Entity\EntityManager $entity_manager
    *   The entity manager used to import config entities.
-   * @param \Drupal\Core\Lock\LockBackendInterface
+   * @param \Drupal\Core\Lock\LockBackendInterface $lock
    *   The lock backend to ensure multiple imports do not occur at the same time.
    * @param \Drupal\Component\Uuid\UuidInterface $uuid_service
    *   The UUID service.
+   * @param \Drupal\Core\Config\StorageComparerInterface $local_comparer
+   *   A storage comparer object used to determine changes since the last import.
    */
-  public function __construct(StorageComparerInterface $storage_comparer, EventDispatcherInterface $event_dispatcher, ConfigFactory $config_factory, EntityManager $entity_manager, LockBackendInterface $lock, UuidInterface $uuid_service) {
+  public function __construct(StorageComparerInterface $storage_comparer, EventDispatcherInterface $event_dispatcher, ConfigFactory $config_factory, EntityManager $entity_manager, LockBackendInterface $lock, UuidInterface $uuid_service, StorageComparerInterface $local_comparer = NULL) {
     $this->storageComparer = $storage_comparer;
     $this->eventDispatcher = $event_dispatcher;
     $this->configFactory = $config_factory;
     $this->entityManager = $entity_manager;
     $this->lock = $lock;
     $this->uuidService = $uuid_service;
+    $this->localComparer = $local_comparer;
     $this->processed = $this->storageComparer->getEmptyChangelist();
     // Use an override free context for importing so that overrides to do not
     // pollute the imported data. The context is hard coded to ensure this is
@@ -229,6 +240,7 @@ public function import() {
         // Another process is synchronizing configuration.
         throw new ConfigImporterException(sprintf('%s is already importing', static::ID));
       }
+      $this->checkForConflicts();
       $this->importInvokeOwner();
       $this->importConfig();
       // Allow modules to react to a import.
@@ -301,6 +313,8 @@ protected function importInvokeOwner() {
           $old_config->load();
 
           $data = $this->storageComparer->getSourceStorage()->read($name);
+          // By this time we know the override is safe, conflicts were checked previously.
+          $data['import.override'] = TRUE;
           $new_config = new Config($name, $this->storageComparer->getTargetStorage(), $this->context);
           if ($data !== FALSE) {
             $new_config->setData($data);
@@ -346,4 +360,15 @@ public function getId() {
     return static::ID;
   }
 
+  public function checkForConflicts() {
+    if ($this->localComparer) {
+      foreach (array('create', 'update') as $op) {
+        $locally_changed = $this->localComparer->getChangelist($op);
+        $remote_changed = $this->getUnprocessed($op);
+        if ($files = array_intersect($remote_changed, $locally_changed)) {
+          throw new ConfigImporterException(String::format('Config files @files changed both locally and remotely', array('@files' => implode(', ', $files))));
+        }
+      }
+    }
+  }
 }
diff --git a/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php b/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php
index 0a11098..53bf979 100644
--- a/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php
+++ b/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php
@@ -172,8 +172,14 @@ public function preSave(EntityStorageControllerInterface $storage_controller) {
     if (!empty($matched_entity) && ($matched_entity != $this->id())) {
       throw new ConfigDuplicateUUIDException(format_string('Attempt to save a configuration entity %id with UUID %uuid when this UUID is already used for %matched', array('%id' => $this->id(), '%uuid' => $this->uuid(), '%matched' => $matched_entity)));
     }
+    $override = FALSE;
+    $override_key = 'import.override';
+    if (!empty($this->$override_key)) {
+      unset($this->$override_key);
+      $override = TRUE;
+    }
 
-    if (!$this->isNew()) {
+    if (!$override && !$this->isNew()) {
       $original = $storage_controller->loadUnchanged($this->id());
       // Ensure that the UUID cannot be changed for an existing entity.
       if ($original && ($original->uuid() != $this->uuid())) {
diff --git a/core/modules/aggregator/config/views.view.aggregator_rss_feed.yml b/core/modules/aggregator/config/views.view.aggregator_rss_feed.yml
index acfb69a..be18d73 100644
--- a/core/modules/aggregator/config/views.view.aggregator_rss_feed.yml
+++ b/core/modules/aggregator/config/views.view.aggregator_rss_feed.yml
@@ -187,5 +187,4 @@ label: 'Aggregator RSS feed'
 module: views
 id: aggregator_rss_feed
 tag: aggregator
-uuid: 7dfa5cb7-2248-4d52-8c00-cd8e02d1e78e
 langcode: en
diff --git a/core/modules/block/custom_block/config/custom_block.type.basic.yml b/core/modules/block/custom_block/config/custom_block.type.basic.yml
index e9cd395..02982e4 100644
--- a/core/modules/block/custom_block/config/custom_block.type.basic.yml
+++ b/core/modules/block/custom_block/config/custom_block.type.basic.yml
@@ -1,6 +1,5 @@
 id: basic
 label: 'Basic block'
-uuid: 4bcdec7a-c867-404b-855d-939a11420b12
 revision: 0
 description: 'A basic block contains a title and a body.'
 langcode: en
diff --git a/core/modules/block/custom_block/config/entity.view_mode.custom_block.full.yml b/core/modules/block/custom_block/config/entity.view_mode.custom_block.full.yml
index b0518cb..ba11a62 100644
--- a/core/modules/block/custom_block/config/entity.view_mode.custom_block.full.yml
+++ b/core/modules/block/custom_block/config/entity.view_mode.custom_block.full.yml
@@ -1,5 +1,4 @@
 id: custom_block.full
-uuid: 96f20030-6465-43ed-9e00-f2a16f52ef6e
 label: Full
 status: false
 cache: true
diff --git a/core/modules/book/config/entity.view_mode.node.print.yml b/core/modules/book/config/entity.view_mode.node.print.yml
index 88eea2e..7854ec1 100644
--- a/core/modules/book/config/entity.view_mode.node.print.yml
+++ b/core/modules/book/config/entity.view_mode.node.print.yml
@@ -1,5 +1,4 @@
 id: node.print
-uuid: 58ded254-7114-4e5b-a50d-1351c48807d8
 label: Print
 status: false
 cache: true
diff --git a/core/modules/book/config/node.type.book.yml b/core/modules/book/config/node.type.book.yml
index 63f98b2..48e720d 100644
--- a/core/modules/book/config/node.type.book.yml
+++ b/core/modules/book/config/node.type.book.yml
@@ -1,5 +1,4 @@
 type: book
-uuid: c5ca890d-7db7-4c45-bf0f-0a12430923ff
 name: 'Book page'
 description: '<em>Books</em> have a built-in hierarchical navigation. Use for handbooks or tutorials.'
 help: ''
diff --git a/core/modules/comment/config/entity.view_mode.comment.full.yml b/core/modules/comment/config/entity.view_mode.comment.full.yml
index f3ce7fc..4b54f7d 100644
--- a/core/modules/comment/config/entity.view_mode.comment.full.yml
+++ b/core/modules/comment/config/entity.view_mode.comment.full.yml
@@ -1,5 +1,4 @@
 id: comment.full
-uuid: 06ab5b16-e197-4242-b72c-4453793fabba
 label: Full comment
 status: false
 cache: true
diff --git a/core/modules/comment/config/system.action.comment_publish_action.yml b/core/modules/comment/config/system.action.comment_publish_action.yml
index 5d5e4ee..ae9d93a 100644
--- a/core/modules/comment/config/system.action.comment_publish_action.yml
+++ b/core/modules/comment/config/system.action.comment_publish_action.yml
@@ -1,5 +1,4 @@
 id: comment_publish_action
-uuid: 890a554f-f083-400c-8d18-2412f2daa140
 label: 'Publish comment'
 status: true
 langcode: en
diff --git a/core/modules/comment/config/system.action.comment_save_action.yml b/core/modules/comment/config/system.action.comment_save_action.yml
index 48c4354..e98a92a 100644
--- a/core/modules/comment/config/system.action.comment_save_action.yml
+++ b/core/modules/comment/config/system.action.comment_save_action.yml
@@ -1,5 +1,4 @@
 id: comment_save_action
-uuid: 10a7269e-b454-40d6-8d00-0f9ffed58f74
 label: 'Save comment'
 status: true
 langcode: en
diff --git a/core/modules/comment/config/system.action.comment_unpublish_action.yml b/core/modules/comment/config/system.action.comment_unpublish_action.yml
index 3f52583..61b8e24 100644
--- a/core/modules/comment/config/system.action.comment_unpublish_action.yml
+++ b/core/modules/comment/config/system.action.comment_unpublish_action.yml
@@ -1,5 +1,4 @@
 id: comment_unpublish_action
-uuid: 64c41e18-26c2-4e54-9747-71018ea27877
 label: 'Unpublish comment'
 status: true
 langcode: en
diff --git a/core/modules/config/lib/Drupal/config/Form/ConfigSync.php b/core/modules/config/lib/Drupal/config/Form/ConfigSync.php
index da65a09..ba3d0e3 100644
--- a/core/modules/config/lib/Drupal/config/Form/ConfigSync.php
+++ b/core/modules/config/lib/Drupal/config/Form/ConfigSync.php
@@ -33,20 +33,27 @@ class ConfigSync extends FormBase {
   protected $lock;
 
   /**
-   * The source configuration object.
+   * The source configuration storage.
    *
    * @var \Drupal\Core\Config\StorageInterface
    */
   protected $sourceStorage;
 
   /**
-   * The target configuration object.
+   * The target configuration storage.
    *
    * @var \Drupal\Core\Config\StorageInterface
    */
   protected $targetStorage;
 
   /**
+   * The snapshot configuration storage.
+   *
+   * @var \Drupal\Core\Config\StorageInterface
+   */
+  protected $snapshotStorage;
+
+  /**
    * Event dispatcher.
    *
    * @var \Symfony\Component\EventDispatcher\EventDispatcherInterface
@@ -92,9 +99,10 @@ class ConfigSync extends FormBase {
    * @param \Drupal\Component\Uuid\UuidInterface $uuid_service
    * The UUID Service.
    */
-  public function __construct(StorageInterface $sourceStorage, StorageInterface $targetStorage, LockBackendInterface $lock, EventDispatcherInterface $event_dispatcher, ConfigFactory $config_factory, EntityManager $entity_manager, UrlGeneratorInterface $url_generator, UuidInterface $uuid_service) {
+  public function __construct(StorageInterface $sourceStorage, StorageInterface $targetStorage, StorageInterface $snapshotStorage, LockBackendInterface $lock, EventDispatcherInterface $event_dispatcher, ConfigFactory $config_factory, EntityManager $entity_manager, UrlGeneratorInterface $url_generator, UuidInterface $uuid_service) {
     $this->sourceStorage = $sourceStorage;
     $this->targetStorage = $targetStorage;
+    $this->snapshotStorage = $snapshotStorage;
     $this->lock = $lock;
     $this->eventDispatcher = $event_dispatcher;
     $this->configFactory = $config_factory;
@@ -110,6 +118,7 @@ public static function create(ContainerInterface $container) {
     return new static(
       $container->get('config.storage.staging'),
       $container->get('config.storage'),
+      $container->get('config.storage.snapshot'),
       $container->get('lock'),
       $container->get('event_dispatcher'),
       $container->get('config.factory'),
@@ -219,7 +228,8 @@ public function submitForm(array &$form, array &$form_state) {
       $this->configFactory,
       $this->entity_manager,
       $this->lock,
-      $this->uuidService
+      $this->uuidService,
+      new StorageComparer($this->snapshotStorage, $this->targetStorage)
     );
     if ($config_importer->alreadyImporting()) {
       drupal_set_message($this->t('Another request may be synchronizing configuration already.'));
diff --git a/core/modules/config/tests/config_other_module_config/config/config_test.dynamic.other_module.yml b/core/modules/config/tests/config_other_module_config/config/config_test.dynamic.other_module.yml
index b144af6..9767b13 100644
--- a/core/modules/config/tests/config_other_module_config/config/config_test.dynamic.other_module.yml
+++ b/core/modules/config/tests/config_other_module_config/config/config_test.dynamic.other_module.yml
@@ -1,5 +1,4 @@
 id: other_module
-uuid: 486f9f5c-82ed-4add-a700-b0ee3af4d17d
 label: 'Other module'
 weight: '0'
 style: ''
diff --git a/core/modules/contact/config/contact.category.feedback.yml b/core/modules/contact/config/contact.category.feedback.yml
index b3ba71f..7e0e9af 100644
--- a/core/modules/contact/config/contact.category.feedback.yml
+++ b/core/modules/contact/config/contact.category.feedback.yml
@@ -1,6 +1,5 @@
 id: feedback
 label: 'Website feedback'
-uuid: 29821a98-2498-4161-8d00-e4dba46dd1e8
 recipients: {  }
 reply: ''
 weight: 0
diff --git a/core/modules/contact/config/contact.category.personal.yml b/core/modules/contact/config/contact.category.personal.yml
index 5847ff0..d81d148 100644
--- a/core/modules/contact/config/contact.category.personal.yml
+++ b/core/modules/contact/config/contact.category.personal.yml
@@ -1,6 +1,5 @@
 id: personal
 label: 'Personal contact form'
-uuid: 4520a81c-a103-4b4d-b000-e95741044672
 recipients: {  }
 reply: ''
 weight: 0
diff --git a/core/modules/file/config/views.view.files.yml b/core/modules/file/config/views.view.files.yml
index 2d633c2..2d735ff 100644
--- a/core/modules/file/config/views.view.files.yml
+++ b/core/modules/file/config/views.view.files.yml
@@ -951,5 +951,4 @@ label: Files
 module: file
 id: files
 tag: default
-uuid: 4b47e09e-16e0-494b-b447-7166191dbb6e
 langcode: en
diff --git a/core/modules/filter/config/filter.format.plain_text.yml b/core/modules/filter/config/filter.format.plain_text.yml
index 97296ec..80e1370 100644
--- a/core/modules/filter/config/filter.format.plain_text.yml
+++ b/core/modules/filter/config/filter.format.plain_text.yml
@@ -4,7 +4,6 @@
 # - may be modified by installation profiles to have other properties.
 format: plain_text
 name: 'Plain text'
-uuid: 7dd77dca-6a80-4538-b10d-133fa66d42f0
 status: true
 weight: 10
 roles:
diff --git a/core/modules/forum/config/entity.display.taxonomy_term.forums.default.yml b/core/modules/forum/config/entity.display.taxonomy_term.forums.default.yml
index c4d4f8b..ef04d82 100644
--- a/core/modules/forum/config/entity.display.taxonomy_term.forums.default.yml
+++ b/core/modules/forum/config/entity.display.taxonomy_term.forums.default.yml
@@ -1,5 +1,4 @@
 id: taxonomy_term.forums.default
-uuid: adaef6a9-8dc0-4f2e-9858-88daac440aa9
 targetEntityType: taxonomy_term
 bundle: forums
 mode: default
diff --git a/core/modules/forum/config/entity.form_display.taxonomy_term.forums.default.yml b/core/modules/forum/config/entity.form_display.taxonomy_term.forums.default.yml
index f091e30..7ae6c33 100644
--- a/core/modules/forum/config/entity.form_display.taxonomy_term.forums.default.yml
+++ b/core/modules/forum/config/entity.form_display.taxonomy_term.forums.default.yml
@@ -1,5 +1,4 @@
 id: taxonomy_term.forums.default
-uuid: c8eab085-8fd3-4545-8600-e13b7d8bb9c4
 targetEntityType: taxonomy_term
 bundle: forums
 mode: default
diff --git a/core/modules/forum/config/field.field.forum_container.yml b/core/modules/forum/config/field.field.forum_container.yml
index 96eb824..fed849d 100644
--- a/core/modules/forum/config/field.field.forum_container.yml
+++ b/core/modules/forum/config/field.field.forum_container.yml
@@ -1,5 +1,4 @@
 id: taxonomy_term.forum_container
-uuid: babf2ba1-505f-4c71-8a07-7be19f4fb9f3
 status: '1'
 langcode: en
 name: forum_container
diff --git a/core/modules/forum/config/field.instance.taxonomy_term.forums.forum_container.yml b/core/modules/forum/config/field.instance.taxonomy_term.forums.forum_container.yml
index 98fde49..3c67904 100644
--- a/core/modules/forum/config/field.instance.taxonomy_term.forums.forum_container.yml
+++ b/core/modules/forum/config/field.instance.taxonomy_term.forums.forum_container.yml
@@ -1,5 +1,4 @@
 id: taxonomy_term.forums.forum_container
-uuid: 8421d585-f6ef-4209-ad00-cfb30a1ab075
 status: true
 langcode: en
 field_uuid: babf2ba1-505f-4c71-8a07-7be19f4fb9f3
diff --git a/core/modules/forum/config/node.type.forum.yml b/core/modules/forum/config/node.type.forum.yml
index a212cad..1a6f18d 100644
--- a/core/modules/forum/config/node.type.forum.yml
+++ b/core/modules/forum/config/node.type.forum.yml
@@ -1,5 +1,4 @@
 type: forum
-uuid: c14b392d-0889-46bd-889e-a239e8b6cd89
 name: 'Forum topic'
 description: 'A <em>forum topic</em> starts a new discussion thread within a forum.'
 help: ''
diff --git a/core/modules/forum/config/rdf.mapping.node.forum.yml b/core/modules/forum/config/rdf.mapping.node.forum.yml
index a533d92..fc47f15 100644
--- a/core/modules/forum/config/rdf.mapping.node.forum.yml
+++ b/core/modules/forum/config/rdf.mapping.node.forum.yml
@@ -1,5 +1,4 @@
 id: node.forum
-uuid: 49f5dc24-84b2-4949-a109-9b7b96990b21
 targetEntityType: node
 bundle: forum
 types:
diff --git a/core/modules/forum/config/rdf.mapping.taxonomy_term.forums.yml b/core/modules/forum/config/rdf.mapping.taxonomy_term.forums.yml
index 5ffe001..aaaf536 100644
--- a/core/modules/forum/config/rdf.mapping.taxonomy_term.forums.yml
+++ b/core/modules/forum/config/rdf.mapping.taxonomy_term.forums.yml
@@ -1,5 +1,4 @@
 id: taxonomy_term.forums
-uuid: c1c3d577-5517-4a43-a334-52884bb3b638
 targetEntityType: taxonomy_term
 bundle: forums
 types:
diff --git a/core/modules/forum/config/taxonomy.vocabulary.forums.yml b/core/modules/forum/config/taxonomy.vocabulary.forums.yml
index 63cc231..74d64ca 100644
--- a/core/modules/forum/config/taxonomy.vocabulary.forums.yml
+++ b/core/modules/forum/config/taxonomy.vocabulary.forums.yml
@@ -1,5 +1,4 @@
 vid: forums
-uuid: c1341fb5-045a-4af4-9b06-6db165364a5f
 name: Forums
 description: 'Forum navigation vocabulary'
 hierarchy: 1
diff --git a/core/modules/image/config/image.style.large.yml b/core/modules/image/config/image.style.large.yml
index cad916a..1f7c10c 100644
--- a/core/modules/image/config/image.style.large.yml
+++ b/core/modules/image/config/image.style.large.yml
@@ -1,5 +1,4 @@
 name: large
-uuid: b05eae5c-1755-4520-b848-72614923a496
 label: 'Large (480x480)'
 effects:
   ddd73aa7-4bd6-4c85-b600-bdf2b1628d1d:
diff --git a/core/modules/image/config/image.style.medium.yml b/core/modules/image/config/image.style.medium.yml
index 6dc7833..77e0d2a 100644
--- a/core/modules/image/config/image.style.medium.yml
+++ b/core/modules/image/config/image.style.medium.yml
@@ -1,5 +1,4 @@
 name: medium
-uuid: be5097eb-e35c-48db-8023-3517d88c3c0f
 label: 'Medium (220x220)'
 effects:
   bddf0d06-42f9-4c75-a700-a33cafa25ea0:
diff --git a/core/modules/image/config/image.style.thumbnail.yml b/core/modules/image/config/image.style.thumbnail.yml
index bc4b625..22b5671 100644
--- a/core/modules/image/config/image.style.thumbnail.yml
+++ b/core/modules/image/config/image.style.thumbnail.yml
@@ -1,5 +1,4 @@
 name: thumbnail
-uuid: 74030a84-ab11-4acd-b730-48b0192721d1
 label: 'Thumbnail (100x100)'
 effects:
   1cfec298-8620-4749-b100-ccb6c4500779:
diff --git a/core/modules/language/config/language.entity.en.yml b/core/modules/language/config/language.entity.en.yml
index f223336..0017d51 100644
--- a/core/modules/language/config/language.entity.en.yml
+++ b/core/modules/language/config/language.entity.en.yml
@@ -1,5 +1,4 @@
 id: en
-uuid: fe61d3d1-e8d5-47a7-a21c-2841f4be3c09
 label: English
 direction: false
 weight: 0
diff --git a/core/modules/language/config/language.entity.und.yml b/core/modules/language/config/language.entity.und.yml
index f7559b1..cdc7abe 100644
--- a/core/modules/language/config/language.entity.und.yml
+++ b/core/modules/language/config/language.entity.und.yml
@@ -1,5 +1,4 @@
 id: und
-uuid: 87e4ef47-819b-4d89-aa4b-757f9ce5a3b2
 label: 'Not specified'
 direction: false
 weight: 1
diff --git a/core/modules/language/config/language.entity.zxx.yml b/core/modules/language/config/language.entity.zxx.yml
index 37b02d9..9031294 100644
--- a/core/modules/language/config/language.entity.zxx.yml
+++ b/core/modules/language/config/language.entity.zxx.yml
@@ -1,5 +1,4 @@
 id: zxx
-uuid: de5bb3a9-1038-4ada-ba05-05cc965ea702
 label: 'Not applicable'
 direction: false
 weight: 2
diff --git a/core/modules/node/config/entity.view_mode.node.full.yml b/core/modules/node/config/entity.view_mode.node.full.yml
index 9d294f1..e4d8bd0 100644
--- a/core/modules/node/config/entity.view_mode.node.full.yml
+++ b/core/modules/node/config/entity.view_mode.node.full.yml
@@ -1,5 +1,4 @@
 id: node.full
-uuid: faa8c4b0-64a5-458e-8e03-3ae4b4daee5b
 label: Full content
 status: '0'
 cache: '1'
diff --git a/core/modules/node/config/entity.view_mode.node.rss.yml b/core/modules/node/config/entity.view_mode.node.rss.yml
index d2b9571..0dbf7c1 100644
--- a/core/modules/node/config/entity.view_mode.node.rss.yml
+++ b/core/modules/node/config/entity.view_mode.node.rss.yml
@@ -1,5 +1,4 @@
 id: node.rss
-uuid: a0f42dfa-6d27-40a3-a506-6d250c0fa47a
 label: RSS
 status: '0'
 cache: '1'
diff --git a/core/modules/node/config/entity.view_mode.node.teaser.yml b/core/modules/node/config/entity.view_mode.node.teaser.yml
index b338d0c..636de15 100644
--- a/core/modules/node/config/entity.view_mode.node.teaser.yml
+++ b/core/modules/node/config/entity.view_mode.node.teaser.yml
@@ -1,5 +1,4 @@
 id: node.teaser
-uuid: 9f83c955-6c84-421b-b156-86764523ee53
 label: Teaser
 status: '1'
 cache: '1'
diff --git a/core/modules/node/config/system.action.node_delete_action.yml b/core/modules/node/config/system.action.node_delete_action.yml
index 72183b0..3adc607 100644
--- a/core/modules/node/config/system.action.node_delete_action.yml
+++ b/core/modules/node/config/system.action.node_delete_action.yml
@@ -1,5 +1,4 @@
 id: node_delete_action
-uuid: 39dc5faa-8f59-4740-a100-b69e7975e6dd
 label: 'Delete selected content'
 status: '1'
 langcode: en
diff --git a/core/modules/node/config/system.action.node_make_sticky_action.yml b/core/modules/node/config/system.action.node_make_sticky_action.yml
index 9358694..14e731a 100644
--- a/core/modules/node/config/system.action.node_make_sticky_action.yml
+++ b/core/modules/node/config/system.action.node_make_sticky_action.yml
@@ -1,5 +1,4 @@
 id: node_make_sticky_action
-uuid: d1d2c940-3dcd-4468-a100-bb4fb7137522
 label: 'Make content sticky'
 status: '1'
 langcode: en
diff --git a/core/modules/node/config/system.action.node_make_unsticky_action.yml b/core/modules/node/config/system.action.node_make_unsticky_action.yml
index 478973e..e8e3a25 100644
--- a/core/modules/node/config/system.action.node_make_unsticky_action.yml
+++ b/core/modules/node/config/system.action.node_make_unsticky_action.yml
@@ -1,5 +1,4 @@
 id: node_make_unsticky_action
-uuid: 63b14a98-3b54-4152-ae12-183b45fbe68d
 label: 'Make content unsticky'
 status: '1'
 langcode: en
diff --git a/core/modules/node/config/system.action.node_promote_action.yml b/core/modules/node/config/system.action.node_promote_action.yml
index 13c2993..3d56d92 100644
--- a/core/modules/node/config/system.action.node_promote_action.yml
+++ b/core/modules/node/config/system.action.node_promote_action.yml
@@ -1,5 +1,4 @@
 id: node_promote_action
-uuid: 593a6ad3-6ff8-4f22-9308-8fb9398f1076
 label: 'Promote content to front page'
 status: '1'
 langcode: en
diff --git a/core/modules/node/config/system.action.node_publish_action.yml b/core/modules/node/config/system.action.node_publish_action.yml
index 5a5a031..220a944 100644
--- a/core/modules/node/config/system.action.node_publish_action.yml
+++ b/core/modules/node/config/system.action.node_publish_action.yml
@@ -1,5 +1,4 @@
 id: node_publish_action
-uuid: 83bc5b18-6987-4106-be00-bbf90333a655
 label: 'Publish content'
 status: '1'
 langcode: en
diff --git a/core/modules/node/config/system.action.node_save_action.yml b/core/modules/node/config/system.action.node_save_action.yml
index af3b617..46472cc 100644
--- a/core/modules/node/config/system.action.node_save_action.yml
+++ b/core/modules/node/config/system.action.node_save_action.yml
@@ -1,5 +1,4 @@
 id: node_save_action
-uuid: 493b5aa1-25b1-4e62-af07-079952c04108
 label: 'Save content'
 status: '1'
 langcode: en
diff --git a/core/modules/node/config/system.action.node_unpromote_action.yml b/core/modules/node/config/system.action.node_unpromote_action.yml
index f0b262d..86d11a7 100644
--- a/core/modules/node/config/system.action.node_unpromote_action.yml
+++ b/core/modules/node/config/system.action.node_unpromote_action.yml
@@ -1,5 +1,4 @@
 id: node_unpromote_action
-uuid: 887c7a3c-8ccf-459c-8528-4089fdbfb143
 label: 'Remove content from front page'
 status: '1'
 langcode: en
diff --git a/core/modules/node/config/system.action.node_unpublish_action.yml b/core/modules/node/config/system.action.node_unpublish_action.yml
index b2938a7..5853069 100644
--- a/core/modules/node/config/system.action.node_unpublish_action.yml
+++ b/core/modules/node/config/system.action.node_unpublish_action.yml
@@ -1,5 +1,4 @@
 id: node_unpublish_action
-uuid: 7479d776-df6e-4c8b-a400-f4246c289850
 label: 'Unpublish content'
 status: '1'
 langcode: en
diff --git a/core/modules/node/config/views.view.content.yml b/core/modules/node/config/views.view.content.yml
index e18480a..8e52da1 100644
--- a/core/modules/node/config/views.view.content.yml
+++ b/core/modules/node/config/views.view.content.yml
@@ -488,5 +488,4 @@ label: Content
 module: node
 id: content
 tag: default
-uuid: 914eaf17-0b90-4fcd-a312-18b51e9dac77
 langcode: en
diff --git a/core/modules/node/config/views.view.frontpage.yml b/core/modules/node/config/views.view.frontpage.yml
index 1a7afa5..c8bf158 100644
--- a/core/modules/node/config/views.view.frontpage.yml
+++ b/core/modules/node/config/views.view.frontpage.yml
@@ -229,5 +229,4 @@ label: Frontpage
 module: node
 id: frontpage
 tag: default
-uuid: 5c8da842-af9f-4a6e-bd00-af738b26ec3c
 langcode: en
diff --git a/core/modules/node/tests/modules/node_test_config/config/node.type.default.yml b/core/modules/node/tests/modules/node_test_config/config/node.type.default.yml
index a93a9c6..93dd999 100644
--- a/core/modules/node/tests/modules/node_test_config/config/node.type.default.yml
+++ b/core/modules/node/tests/modules/node_test_config/config/node.type.default.yml
@@ -1,5 +1,4 @@
 type: default
-uuid: ca226632-3186-42a2-8440-a526f20840af
 name: Default
 description: 'Default description.'
 help: ''
diff --git a/core/modules/search/config/entity.view_mode.node.search_index.yml b/core/modules/search/config/entity.view_mode.node.search_index.yml
index ccbb45b..e12156d 100644
--- a/core/modules/search/config/entity.view_mode.node.search_index.yml
+++ b/core/modules/search/config/entity.view_mode.node.search_index.yml
@@ -1,5 +1,4 @@
 id: node.search_index
-uuid: 17b34a6b-401f-421a-8100-f1879cbc565a
 label: Search index
 status: '0'
 cache: '1'
diff --git a/core/modules/search/config/entity.view_mode.node.search_result.yml b/core/modules/search/config/entity.view_mode.node.search_result.yml
index f361340..776ada9 100644
--- a/core/modules/search/config/entity.view_mode.node.search_result.yml
+++ b/core/modules/search/config/entity.view_mode.node.search_result.yml
@@ -1,5 +1,4 @@
 id: node.search_result
-uuid: 095d7357-de7d-4acc-953a-585cd106e89b
 label: Search result
 status: '0'
 cache: '1'
diff --git a/core/modules/shortcut/config/shortcut.set.default.yml b/core/modules/shortcut/config/shortcut.set.default.yml
index 784da9c..3e50e3b 100644
--- a/core/modules/shortcut/config/shortcut.set.default.yml
+++ b/core/modules/shortcut/config/shortcut.set.default.yml
@@ -1,3 +1,2 @@
 id: default
-uuid: b28b577b-1426-416c-923b-599f65f31aba
 label: Default
diff --git a/core/modules/system/config/system.date_format.fallback.yml b/core/modules/system/config/system.date_format.fallback.yml
index 51e0182..5b910da 100644
--- a/core/modules/system/config/system.date_format.fallback.yml
+++ b/core/modules/system/config/system.date_format.fallback.yml
@@ -1,5 +1,4 @@
 id: fallback
-uuid: cf0ad071-ded7-4750-b008-8c74f200ff8d
 label: 'Fallback date format'
 status: true
 langcode: en
diff --git a/core/modules/system/config/system.date_format.html_date.yml b/core/modules/system/config/system.date_format.html_date.yml
index 50f2509..72de454 100644
--- a/core/modules/system/config/system.date_format.html_date.yml
+++ b/core/modules/system/config/system.date_format.html_date.yml
@@ -1,5 +1,4 @@
 id: html_date
-uuid: f4028e7f-3ed8-4737-8f27-39b618214a1f
 label: 'HTML Date'
 status: true
 langcode: en
diff --git a/core/modules/system/config/system.date_format.html_datetime.yml b/core/modules/system/config/system.date_format.html_datetime.yml
index 33fad39..03851d2 100644
--- a/core/modules/system/config/system.date_format.html_datetime.yml
+++ b/core/modules/system/config/system.date_format.html_datetime.yml
@@ -1,5 +1,4 @@
 id: html_datetime
-uuid: bfd7db46-607f-477f-9047-713c312dbb02
 label: 'HTML Datetime'
 status: true
 langcode: en
diff --git a/core/modules/system/config/system.date_format.html_month.yml b/core/modules/system/config/system.date_format.html_month.yml
index b2c8c60..52449b4 100644
--- a/core/modules/system/config/system.date_format.html_month.yml
+++ b/core/modules/system/config/system.date_format.html_month.yml
@@ -1,5 +1,4 @@
 id: html_month
-uuid: f85dd1b6-0edb-4024-a800-bb8c87805b2b
 label: 'HTML Month'
 status: true
 langcode: en
diff --git a/core/modules/system/config/system.date_format.html_time.yml b/core/modules/system/config/system.date_format.html_time.yml
index d804313..ef85587 100644
--- a/core/modules/system/config/system.date_format.html_time.yml
+++ b/core/modules/system/config/system.date_format.html_time.yml
@@ -1,5 +1,4 @@
 id: html_time
-uuid: f8e87532-396e-4353-b02c-4493d2031bc6
 label: 'HTML Time'
 status: true
 langcode: en
diff --git a/core/modules/system/config/system.date_format.html_week.yml b/core/modules/system/config/system.date_format.html_week.yml
index 4258b21..614cc50 100644
--- a/core/modules/system/config/system.date_format.html_week.yml
+++ b/core/modules/system/config/system.date_format.html_week.yml
@@ -1,5 +1,4 @@
 id: html_week
-uuid: d14737ae-d1e0-436b-9225-37113d4c8c7c
 label: 'HTML Week'
 status: true
 langcode: en
diff --git a/core/modules/system/config/system.date_format.html_year.yml b/core/modules/system/config/system.date_format.html_year.yml
index aaba268..7e0e003 100644
--- a/core/modules/system/config/system.date_format.html_year.yml
+++ b/core/modules/system/config/system.date_format.html_year.yml
@@ -1,5 +1,4 @@
 id: html_year
-uuid: a43b8034-a2f2-4507-9400-bed7d389265f
 label: 'HTML Year'
 status: true
 langcode: en
diff --git a/core/modules/system/config/system.date_format.html_yearless_date.yml b/core/modules/system/config/system.date_format.html_yearless_date.yml
index 221244b..f7191ea 100644
--- a/core/modules/system/config/system.date_format.html_yearless_date.yml
+++ b/core/modules/system/config/system.date_format.html_yearless_date.yml
@@ -1,5 +1,4 @@
 id: html_yearless_date
-uuid: 623ab5ae-ebba-42cc-b100-a4ca10c77b2e
 label: 'HTML Yearless date'
 status: true
 langcode: en
diff --git a/core/modules/system/config/system.date_format.long.yml b/core/modules/system/config/system.date_format.long.yml
index d9492bc..47268eb 100644
--- a/core/modules/system/config/system.date_format.long.yml
+++ b/core/modules/system/config/system.date_format.long.yml
@@ -1,5 +1,4 @@
 id: long
-uuid: 500ad047-44b4-429f-9b00-d54df9cbaa8c
 label: 'Default long date'
 status: true
 langcode: en
diff --git a/core/modules/system/config/system.date_format.medium.yml b/core/modules/system/config/system.date_format.medium.yml
index 82c18f2..cc948d7 100644
--- a/core/modules/system/config/system.date_format.medium.yml
+++ b/core/modules/system/config/system.date_format.medium.yml
@@ -1,5 +1,4 @@
 id: medium
-uuid: 17a8d708-e3b1-432d-9d36-542a97346a60
 label: 'Default medium date'
 status: true
 langcode: en
diff --git a/core/modules/system/config/system.date_format.short.yml b/core/modules/system/config/system.date_format.short.yml
index bfba918..e25d9b6 100644
--- a/core/modules/system/config/system.date_format.short.yml
+++ b/core/modules/system/config/system.date_format.short.yml
@@ -1,5 +1,4 @@
 id: short
-uuid: a8ee7b86-5ef8-43a5-b200-d2e40e10cd58
 label: 'Default short date'
 status: true
 langcode: en
diff --git a/core/modules/taxonomy/config/entity.view_mode.taxonomy_term.full.yml b/core/modules/taxonomy/config/entity.view_mode.taxonomy_term.full.yml
index 3ab1f25..2666012 100644
--- a/core/modules/taxonomy/config/entity.view_mode.taxonomy_term.full.yml
+++ b/core/modules/taxonomy/config/entity.view_mode.taxonomy_term.full.yml
@@ -1,5 +1,4 @@
 id: taxonomy_term.full
-uuid: dd617891-9328-496b-9500-b989ad5424f7
 label: Taxonomy term page
 status: '0'
 cache: '1'
diff --git a/core/modules/user/config/entity.form_mode.user.register.yml b/core/modules/user/config/entity.form_mode.user.register.yml
index 98726fd..c720f19 100644
--- a/core/modules/user/config/entity.form_mode.user.register.yml
+++ b/core/modules/user/config/entity.form_mode.user.register.yml
@@ -1,5 +1,4 @@
 id: user.register
-uuid: 1d8bdf42-c908-43b6-a802-bb350d80a248
 label: Register
 status: true
 targetEntityType: user
diff --git a/core/modules/user/config/entity.view_mode.user.compact.yml b/core/modules/user/config/entity.view_mode.user.compact.yml
index f738030..4522e10 100644
--- a/core/modules/user/config/entity.view_mode.user.compact.yml
+++ b/core/modules/user/config/entity.view_mode.user.compact.yml
@@ -1,5 +1,4 @@
 id: user.compact
-uuid: a5572673-f233-4576-9739-5f4dcfd1e7fe
 label: Compact
 status: true
 cache: true
diff --git a/core/modules/user/config/entity.view_mode.user.full.yml b/core/modules/user/config/entity.view_mode.user.full.yml
index 7110416..fa17bb9 100644
--- a/core/modules/user/config/entity.view_mode.user.full.yml
+++ b/core/modules/user/config/entity.view_mode.user.full.yml
@@ -1,5 +1,4 @@
 id: user.full
-uuid: 021fa7ab-8e19-4ab7-8c4e-b68edcfacb52
 label: User account
 status: false
 cache: true
diff --git a/core/modules/user/config/rdf.mapping.user.user.yml b/core/modules/user/config/rdf.mapping.user.user.yml
index 37b3add..ad082a9 100644
--- a/core/modules/user/config/rdf.mapping.user.user.yml
+++ b/core/modules/user/config/rdf.mapping.user.user.yml
@@ -1,5 +1,4 @@
 id: user.user
-uuid: 7609b39d-7a70-46e6-a410-16388fbb40b1
 targetEntityType: user
 bundle: user
 types:
diff --git a/core/modules/user/config/system.action.user_block_user_action.yml b/core/modules/user/config/system.action.user_block_user_action.yml
index 8a63a79..2c4ed88 100644
--- a/core/modules/user/config/system.action.user_block_user_action.yml
+++ b/core/modules/user/config/system.action.user_block_user_action.yml
@@ -1,5 +1,4 @@
 id: user_block_user_action
-uuid: 0e67a49a-8d5b-468c-9702-2eeb1441f45a
 label: 'Block the selected user(s)'
 status: '1'
 langcode: en
diff --git a/core/modules/user/config/system.action.user_cancel_user_action.yml b/core/modules/user/config/system.action.user_cancel_user_action.yml
index b4c9b86..b69d2d9 100644
--- a/core/modules/user/config/system.action.user_cancel_user_action.yml
+++ b/core/modules/user/config/system.action.user_cancel_user_action.yml
@@ -1,5 +1,4 @@
 id: user_cancel_user_action
-uuid: 73748b91-e690-455e-b949-73fdd60742a8
 label: 'Cancel the selected user account(s)'
 status: '1'
 langcode: en
diff --git a/core/modules/user/config/system.action.user_unblock_user_action.yml b/core/modules/user/config/system.action.user_unblock_user_action.yml
index fda803e..20a6fd5 100644
--- a/core/modules/user/config/system.action.user_unblock_user_action.yml
+++ b/core/modules/user/config/system.action.user_unblock_user_action.yml
@@ -1,5 +1,4 @@
 id: user_unblock_user_action
-uuid: c97b142f-d25a-41af-ae06-6a535b880ba8
 label: 'Unblock the selected user(s)'
 status: '1'
 langcode: en
diff --git a/core/modules/user/config/user.role.anonymous.yml b/core/modules/user/config/user.role.anonymous.yml
index 9903ca7..1947f35 100644
--- a/core/modules/user/config/user.role.anonymous.yml
+++ b/core/modules/user/config/user.role.anonymous.yml
@@ -1,5 +1,4 @@
 id: anonymous
 label: Anonymous user
 weight: 0
-uuid: 4a916541-1cc7-4175-a55a-906ed2a005a0
 langcode: en
diff --git a/core/modules/user/config/user.role.authenticated.yml b/core/modules/user/config/user.role.authenticated.yml
index c23cc19..16df96d 100644
--- a/core/modules/user/config/user.role.authenticated.yml
+++ b/core/modules/user/config/user.role.authenticated.yml
@@ -1,5 +1,4 @@
 id: authenticated
 label: Authenticated user
 weight: 1
-uuid: 515250c9-46bd-4611-ba06-6b8cfd63f1a7
 langcode: en
diff --git a/core/modules/views/config/views.view.archive.yml b/core/modules/views/config/views.view.archive.yml
index 56bbc67..69921b9 100644
--- a/core/modules/views/config/views.view.archive.yml
+++ b/core/modules/views/config/views.view.archive.yml
@@ -161,5 +161,4 @@ label: Archive
 module: node
 id: archive
 tag: default
-uuid: 39fb337d-c126-446c-8345-6908b45313ca
 langcode: en
diff --git a/core/modules/views/config/views.view.comments_recent.yml b/core/modules/views/config/views.view.comments_recent.yml
index 5c50aae..b1a360f 100644
--- a/core/modules/views/config/views.view.comments_recent.yml
+++ b/core/modules/views/config/views.view.comments_recent.yml
@@ -462,5 +462,4 @@ label: 'Recent comments'
 module: comment
 id: comments_recent
 tag: default
-uuid: 67212880-6a63-453b-a902-2d13580f7d1c
 langcode: en
diff --git a/core/modules/views/config/views.view.glossary.yml b/core/modules/views/config/views.view.glossary.yml
index 21803e4..8241fec 100644
--- a/core/modules/views/config/views.view.glossary.yml
+++ b/core/modules/views/config/views.view.glossary.yml
@@ -373,5 +373,4 @@ label: Glossary
 module: node
 id: glossary
 tag: default
-uuid: da0cfcf2-3e94-436f-a900-0dd0c2310cd7
 langcode: en
diff --git a/core/modules/views/config/views.view.taxonomy_term.yml b/core/modules/views/config/views.view.taxonomy_term.yml
index c5cab5b..26d4bd4 100644
--- a/core/modules/views/config/views.view.taxonomy_term.yml
+++ b/core/modules/views/config/views.view.taxonomy_term.yml
@@ -227,5 +227,4 @@ label: 'Taxonomy term'
 module: taxonomy
 id: taxonomy_term
 tag: default
-uuid: e0dea92e-a4c9-4442-a518-2499bfe17d73
 langcode: en
diff --git a/core/modules/views/config/views.view.tracker.yml b/core/modules/views/config/views.view.tracker.yml
index 0e2b299..66d83c5 100644
--- a/core/modules/views/config/views.view.tracker.yml
+++ b/core/modules/views/config/views.view.tracker.yml
@@ -569,5 +569,4 @@ label: Tracker
 module: node
 id: tracker
 tag: default
-uuid: 8bada3d5-50a4-469e-ae06-6dc98e11e5ec
 langcode: en
diff --git a/core/modules/views_ui/config/tour.tour.views-ui.yml b/core/modules/views_ui/config/tour.tour.views-ui.yml
index a7e6fa9..1ba08e7 100644
--- a/core/modules/views_ui/config/tour.tour.views-ui.yml
+++ b/core/modules/views_ui/config/tour.tour.views-ui.yml
@@ -1,5 +1,4 @@
 id: views-ui
-uuid: 261db4f0-603c-440d-8211-17a095614851
 module: views_ui
 label: 'Views ui'
 langcode: en