diff -u b/core/modules/migrate_drupal/src/Tests/MigrateDrupalTestBase.php b/core/modules/migrate_drupal/src/Tests/MigrateDrupalTestBase.php
--- b/core/modules/migrate_drupal/src/Tests/MigrateDrupalTestBase.php
+++ b/core/modules/migrate_drupal/src/Tests/MigrateDrupalTestBase.php
@@ -9,7 +9,6 @@
 
 use Drupal\migrate\Tests\MigrateTestBase;
 use Drupal\migrate\Entity\Migration;
-use Drupal\migrate\MigrationStorage;
 use Drupal\Component\Plugin\Exception\PluginNotFoundException;
 
 /**
@@ -49,12 +48,12 @@
    * Turn all the migration templates for the specified drupal version into
    * real migration entities so we can test them.
    *
-   * @param $version
+   * @param string $version
    *  Drupal version as provided in migration_tags - e.g., 'Drupal 6'.
    */
   protected function installMigrations($version) {
     $migration_templates = \Drupal::service('migrate.template_storage')->findTemplatesByTag($version);
-    foreach ($migration_templates as $template_name => $template) {
+    foreach ($migration_templates as $template) {
       try {
         $migration = Migration::create($template);
         $migration->save();
diff -u b/core/modules/migrate_drupal/src/Tests/MigrateFullDrupalTestBase.php b/core/modules/migrate_drupal/src/Tests/MigrateFullDrupalTestBase.php
--- b/core/modules/migrate_drupal/src/Tests/MigrateFullDrupalTestBase.php
+++ b/core/modules/migrate_drupal/src/Tests/MigrateFullDrupalTestBase.php
@@ -55,7 +55,6 @@
     $this->loadDumps($dumps);
 
     $classes = $this->getTestClassesList();
-    $template_storage = \Drupal::service('migrate.template_storage');
     foreach ($classes as $class) {
       if (is_subclass_of($class, '\Drupal\migrate\Tests\MigrateDumpAlterInterface')) {
         $class::migrateDumpAlter($this);
@@ -65,16 +64,6 @@
     // Run every migration in the order specified by the storage controller.
     foreach (entity_load_multiple('migration', static::$migrations) as $migration) {
       (new MigrateExecutable($migration, $this))->import();
-
-      // Ensure that the default migration has the correct dependencies.
-      list($base_name, ) = explode(':', $migration->id(), 2);
-      $default_configuration = $template_storage->read('migrate.migration.' . $base_name);
-      $default_dependencies = isset($default_configuration['dependencies']) ? $default_configuration['dependencies'] : [];
-      $this->assertEqual($default_dependencies, $migration->getDependencies(), SafeMarkup::format('Dependencies in @id match after installing. Default configuration @first is equal to active configuration @second.', array(
-        '@id' => $migration->id(),
-        '@first' => var_export($default_dependencies, TRUE),
-        '@second' => var_export($migration->getDependencies(), TRUE)
-      )));
     }
     foreach ($classes as $class) {
       $test_object = new $class($this->testId);
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_action_settings.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_action_settings.yml
@@ -11,7 +11,3 @@ process:
 destination:
   plugin: config
   config_name: action.settings
-dependencies:
-  module:
-    - action
-    - migrate_drupal
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_aggregator_feed.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_aggregator_feed.yml
@@ -4,7 +4,6 @@ migration_tags:
   - Drupal 6
 source:
   plugin: d6_aggregator_feed
-
 process:
   fid: fid
   title: title
@@ -16,10 +15,5 @@ process:
   image: image
   etag: etag
   modified: modified
-
 destination:
   plugin: entity:aggregator_feed
-dependencies:
-  module:
-    - aggregator
-    - migrate_drupal
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_aggregator_item.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_aggregator_item.yml
@@ -22,9 +22,3 @@ destination:
 migration_dependencies:
   required:
     - d6_aggregator_feed
-dependencies:
-  config:
-    - migrate.migration.d6_aggregator_feed
-  module:
-    - aggregator
-    - migrate_drupal
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_aggregator_settings.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_aggregator_settings.yml
@@ -23,7 +23,3 @@ process:
 destination:
   plugin: config
   config_name: aggregator.settings
-dependencies:
-  module:
-    - aggregator
-    - migrate_drupal
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_block.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_block.yml
@@ -92,11 +92,3 @@ migration_dependencies:
     - d6_menu
     - d6_custom_block
     - d6_user_role
-dependencies:
-  config:
-    - migrate.migration.d6_custom_block
-    - migrate.migration.d6_menu
-    - migrate.migration.d6_user_role
-  module:
-    - block
-    - migrate_drupal
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_block_content_body_field.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_block_content_body_field.yml
@@ -23,10 +23,3 @@ destination:
 migration_dependencies:
   required:
     - d6_block_content_type
-dependencies:
-  config:
-    - migrate.migration.d6_block_content_type
-  module:
-    - block_content
-    - field
-    - migrate_drupal
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_block_content_type.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_block_content_type.yml
@@ -14,7 +14,3 @@ process:
   label: 'constants/label'
 destination:
   plugin: entity:block_content_type
-dependencies:
-  module:
-    - block_content
-    - migrate_drupal
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_book.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_book.yml
@@ -21,10 +21,3 @@ destination:
 migration_dependencies:
   required:
     - d6_node
-dependencies:
-  config:
-    - migrate.migration.d6_node
-  module:
-    - book
-    - migrate_drupal
-    - node
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_book_settings.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_book_settings.yml
@@ -15,7 +15,3 @@ process:
 destination:
   plugin: config
   config_name: book.settings
-dependencies:
-  module:
-    - book
-    - migrate_drupal
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_cck_field_revision.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_cck_field_revision.yml
@@ -15,10 +15,3 @@ migration_dependencies:
   required:
     - d6_cck_field_values
     - d6_node_revision
-dependencies:
-  config:
-    - migrate.migration.d6_cck_field_values
-    - migrate.migration.d6_node_revision
-  module:
-    - migrate_drupal
-    - node
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_cck_field_values.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_cck_field_values.yml
@@ -19,11 +19,3 @@ migration_dependencies:
     - d6_node
     - d6_field_formatter_settings
     - d6_field_instance_widget_settings
-dependencies:
-  config:
-    - migrate.migration.d6_field_formatter_settings
-    - migrate.migration.d6_field_instance_widget_settings
-    - migrate.migration.d6_node
-  module:
-    - migrate_drupal
-    - node
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_comment.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_comment.yml
@@ -43,15 +43,3 @@ migration_dependencies:
     - d6_comment_entity_display
     - d6_comment_entity_form_display
     - d6_filter_format
-dependencies:
-  config:
-    - migrate.migration.d6_comment_entity_display
-    - migrate.migration.d6_comment_entity_form_display
-    - migrate.migration.d6_comment_type
-    - migrate.migration.d6_filter_format
-    - migrate.migration.d6_node
-    - migrate.migration.d6_user
-  module:
-    - comment
-    - migrate_drupal
-    - node
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_comment_entity_display.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_comment_entity_display.yml
@@ -24,9 +24,3 @@ destination:
 migration_dependencies:
   required:
     - d6_comment_field_instance
-dependencies:
-  config:
-    - migrate.migration.d6_comment_field_instance
-  module:
-    - migrate_drupal
-    - node
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_comment_entity_form_display.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_comment_entity_form_display.yml
@@ -23,9 +23,3 @@ destination:
 migration_dependencies:
   required:
     - d6_comment_field_instance
-dependencies:
-  config:
-    - migrate.migration.d6_comment_field_instance
-  module:
-    - migrate_drupal
-    - node
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_comment_entity_form_display_subject.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_comment_entity_form_display_subject.yml
@@ -30,9 +30,3 @@ destination:
 migration_dependencies:
   required:
     - d6_comment_type
-dependencies:
-  config:
-    - migrate.migration.d6_comment_type
-  module:
-    - comment
-    - migrate_drupal
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_comment_field.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_comment_field.yml
@@ -17,11 +17,3 @@ destination:
 migration_dependencies:
   required:
     - d6_comment_type
-dependencies:
-  config:
-    - migrate.migration.d6_comment_type
-  module:
-    - comment
-    - field
-    - migrate_drupal
-    - node
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_comment_field_instance.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_comment_field_instance.yml
@@ -32,11 +32,3 @@ migration_dependencies:
   required:
     - d6_comment_field
     - d6_node_type
-dependencies:
-  config:
-    - migrate.migration.d6_comment_field
-    - migrate.migration.d6_node_type
-  module:
-    - field
-    - migrate_drupal
-    - node
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_comment_type.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_comment_type.yml
@@ -13,8 +13,3 @@ process:
   description: description
 destination:
   plugin: entity:comment_type
-dependencies:
-  module:
-    - comment
-    - migrate_drupal
-    - node
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_contact_category.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_contact_category.yml
@@ -20,7 +20,3 @@ process:
   weight: weight
 destination:
   plugin: entity:contact_form
-dependencies:
-  module:
-    - contact
-    - migrate_drupal
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_contact_settings.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_contact_settings.yml
@@ -20,9 +20,3 @@ destination:
 migration_dependencies:
   required:
     - d6_contact_category
-dependencies:
-  config:
-    - migrate.migration.d6_contact_category
-  module:
-    - contact
-    - migrate_drupal
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_custom_block.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_custom_block.yml
@@ -22,10 +22,3 @@ migration_dependencies:
   required:
     - d6_filter_format
     - d6_block_content_body_field
-dependencies:
-  config:
-    - migrate.migration.d6_block_content_body_field
-    - migrate.migration.d6_filter_format
-  module:
-    - block_content
-    - migrate_drupal
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_date_formats.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_date_formats.yml
@@ -19,6 +19,3 @@ process:
   pattern: value
 destination:
   plugin: entity:date_format
-dependencies:
-  module:
-    - migrate_drupal
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_dblog_settings.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_dblog_settings.yml
@@ -11,7 +11,3 @@ process:
 destination:
   plugin: config
   config_name: dblog.settings
-dependencies:
-  module:
-    - dblog
-    - migrate_drupal
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_field.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_field.yml
@@ -131,8 +131,3 @@ process:
 
 destination:
   plugin: md_entity:field_storage_config
-dependencies:
-  module:
-    - field
-    - migrate_drupal
-    - node
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_field_formatter_settings.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_field_formatter_settings.yml
@@ -261,10 +261,3 @@ migration_dependencies:
   required:
     - d6_field_instance
     - d6_view_modes
-dependencies:
-  config:
-    - migrate.migration.d6_field_instance
-    - migrate.migration.d6_view_modes
-  module:
-    - migrate_drupal
-    - node
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_field_instance.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_field_instance.yml
@@ -50,11 +50,3 @@ migration_dependencies:
   required:
     - d6_node_type
     - d6_field
-dependencies:
-  config:
-    - migrate.migration.d6_field
-    - migrate.migration.d6_node_type
-  module:
-    - field
-    - migrate_drupal
-    - node
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_field_instance_widget_settings.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_field_instance_widget_settings.yml
@@ -60,9 +60,3 @@ destination:
 migration_dependencies:
   required:
     - d6_field_instance
-dependencies:
-  config:
-    - migrate.migration.d6_field_instance
-  module:
-    - migrate_drupal
-    - node
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_file.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_file.yml
@@ -23,7 +23,3 @@ process:
   uid: uid
 destination:
   plugin: entity:file
-dependencies:
-  module:
-    - file
-    - migrate_drupal
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_file_settings.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_file_settings.yml
@@ -15,7 +15,3 @@ process:
 destination:
   plugin: config
   config_name: file.settings
-dependencies:
-  module:
-    - file
-    - migrate_drupal
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_filter_format.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_filter_format.yml
@@ -43,7 +43,3 @@ process:
 destination:
   plugin: entity:filter_format
   no_stub: true
-dependencies:
-  module:
-    - filter
-    - migrate_drupal
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_forum_settings.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_forum_settings.yml
@@ -27,9 +27,3 @@ destination:
 migration_dependencies:
   required:
     - d6_taxonomy_vocabulary
-dependencies:
-  config:
-    - migrate.migration.d6_taxonomy_vocabulary
-  module:
-    - forum
-    - migrate_drupal
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_locale_settings.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_locale_settings.yml
@@ -13,7 +13,3 @@ process:
 destination:
   plugin: config
   config_name: locale.settings
-dependencies:
-  module:
-    - locale
-    - migrate_drupal
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_menu.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_menu.yml
@@ -10,7 +10,3 @@ process:
   description: description
 destination:
   plugin: entity:menu
-dependencies:
-  module:
-    - migrate_drupal
-    - system
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_menu_links.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_menu_links.yml
@@ -45,9 +45,3 @@ destination:
 migration_dependencies:
   required:
     - d6_menu
-dependencies:
-  config:
-    - migrate.migration.d6_menu
-  module:
-    - menu_link_content
-    - migrate_drupal
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_menu_settings.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_menu_settings.yml
@@ -15,7 +15,3 @@ process:
 destination:
   plugin: config
   config_name: menu_ui.settings
-dependencies:
-  module:
-    - menu_ui
-    - migrate_drupal
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_node.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_node.yml
@@ -53,12 +53,3 @@ migration_dependencies:
   optional:
     - d6_field_instance_widget_settings
     - d6_field_formatter_settings
-dependencies:
-  config:
-    - migrate.migration.d6_filter_format
-    - migrate.migration.d6_node_settings
-    - migrate.migration.d6_node_type
-    - migrate.migration.d6_user
-  module:
-    - migrate_drupal
-    - node
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_node_revision.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_node_revision.yml
@@ -40,9 +40,3 @@ destination:
 migration_dependencies:
   required:
     - d6_node
-dependencies:
-  config:
-    - migrate.migration.d6_node
-  module:
-    - migrate_drupal
-    - node
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_node_setting_promote.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_node_setting_promote.yml
@@ -17,9 +17,3 @@ destination:
 migration_dependencies:
   required:
     - d6_node_type
-dependencies:
-  config:
-    - migrate.migration.d6_node_type
-  module:
-    - migrate_drupal
-    - node
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_node_setting_status.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_node_setting_status.yml
@@ -17,9 +17,3 @@ destination:
 migration_dependencies:
   required:
     - d6_node_type
-dependencies:
-  config:
-    - migrate.migration.d6_node_type
-  module:
-    - migrate_drupal
-    - node
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_node_setting_sticky.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_node_setting_sticky.yml
@@ -17,9 +17,3 @@ destination:
 migration_dependencies:
   required:
     - d6_node_type
-dependencies:
-  config:
-    - migrate.migration.d6_node_type
-  module:
-    - migrate_drupal
-    - node
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_node_settings.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_node_settings.yml
@@ -11,7 +11,3 @@ process:
 destination:
   plugin: config
   config_name: node.settings
-dependencies:
-  module:
-    - migrate_drupal
-    - node
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_node_type.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_node_type.yml
@@ -22,7 +22,3 @@ process:
   create_body_label: body_label
 destination:
   plugin: entity:node_type
-dependencies:
-  module:
-    - migrate_drupal
-    - node
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_profile_values.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_profile_values.yml
@@ -16,12 +16,3 @@ migration_dependencies:
     - d6_user_profile_field_instance
     - d6_user_profile_entity_display
     - d6_user_profile_entity_form_display
-dependencies:
-  config:
-    - migrate.migration.d6_user
-    - migrate.migration.d6_user_profile_entity_display
-    - migrate.migration.d6_user_profile_entity_form_display
-    - migrate.migration.d6_user_profile_field_instance
-  module:
-    - migrate_drupal
-    - user
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_search_page.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_search_page.yml
@@ -23,7 +23,3 @@ process:
     plugin: d6_search_configuration_rankings
 destination:
   plugin: entity:search_page
-dependencies:
-  module:
-    - migrate_drupal
-    - search
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_search_settings.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_search_settings.yml
@@ -20,7 +20,3 @@ process:
 destination:
   plugin: config
   config_name: search.settings
-dependencies:
-  module:
-    - migrate_drupal
-    - search
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_simpletest_settings.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_simpletest_settings.yml
@@ -19,7 +19,3 @@ process:
 destination:
   plugin: config
   config_name: simpletest.settings
-dependencies:
-  module:
-    - migrate_drupal
-    - simpletest
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_statistics_settings.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_statistics_settings.yml
@@ -15,7 +15,3 @@ process:
 destination:
   plugin: config
   config_name: statistics.settings
-dependencies:
-  module:
-    - migrate_drupal
-    - statistics
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_syslog_settings.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_syslog_settings.yml
@@ -13,7 +13,3 @@ process:
 destination:
   plugin: config
   config_name: syslog.settings
-dependencies:
-  module:
-    - migrate_drupal
-    - syslog
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_cron.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_system_cron.yml
@@ -14,7 +14,3 @@ process:
 destination:
   plugin: config
   config_name: system.cron
-dependencies:
-  module:
-    - migrate_drupal
-    - system
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_file.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_system_file.yml
@@ -18,7 +18,3 @@ process:
 destination:
   plugin: config
   config_name: system.file
-dependencies:
-  module:
-    - migrate_drupal
-    - system
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_filter.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_system_filter.yml
@@ -11,7 +11,3 @@ process:
 destination:
   plugin: config
   config_name: system.filter
-dependencies:
-  module:
-    - migrate_drupal
-    - system
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_image.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_system_image.yml
@@ -11,7 +11,3 @@ process:
 destination:
   plugin: config
   config_name: system.image
-dependencies:
-  module:
-    - migrate_drupal
-    - system
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_image_gd.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_system_image_gd.yml
@@ -11,7 +11,3 @@ process:
 destination:
   plugin: config
   config_name: system.image.gd
-dependencies:
-  module:
-    - migrate_drupal
-    - system
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_logging.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_system_logging.yml
@@ -19,7 +19,3 @@ process:
 destination:
   plugin: config
   config_name: system.logging
-dependencies:
-  module:
-    - migrate_drupal
-    - system
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_maintenance.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_system_maintenance.yml
@@ -11,7 +11,3 @@ process:
 destination:
   plugin: config
   config_name: system.maintenance
-dependencies:
-  module:
-    - migrate_drupal
-    - system
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_performance.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_system_performance.yml
@@ -18,7 +18,3 @@ process:
 destination:
   plugin: config
   config_name: system.performance
-dependencies:
-  module:
-    - migrate_drupal
-    - system
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_rss.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_system_rss.yml
@@ -13,7 +13,3 @@ process:
 destination:
   plugin: config
   config_name: system.rss
-dependencies:
-  module:
-    - migrate_drupal
-    - system
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_site.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_system_site.yml
@@ -39,7 +39,3 @@ process:
 destination:
   plugin: config
   config_name: system.site
-dependencies:
-  module:
-    - migrate_drupal
-    - system
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_taxonomy_settings.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_taxonomy_settings.yml
@@ -13,7 +13,3 @@ process:
 destination:
   plugin: config
   config_name: taxonomy.settings
-dependencies:
-  module:
-    - migrate_drupal
-    - taxonomy
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_taxonomy_term.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_taxonomy_term.yml
@@ -27,9 +27,3 @@ destination:
 migration_dependencies:
   required:
     - d6_taxonomy_vocabulary
-dependencies:
-  config:
-    - migrate.migration.d6_taxonomy_vocabulary
-  module:
-    - migrate_drupal
-    - taxonomy
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_taxonomy_vocabulary.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_taxonomy_vocabulary.yml
@@ -21,7 +21,3 @@ process:
   weight: weight
 destination:
   plugin: entity:taxonomy_vocabulary
-dependencies:
-  module:
-    - migrate_drupal
-    - taxonomy
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_term_node.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_term_node.yml
@@ -20,11 +20,3 @@ migration_dependencies:
     - d6_vocabulary_entity_display
     - d6_vocabulary_entity_form_display
     - d6_node
-dependencies:
-  config:
-    - migrate.migration.d6_node
-    - migrate.migration.d6_vocabulary_entity_display
-    - migrate.migration.d6_vocabulary_entity_form_display
-  module:
-    - migrate_drupal
-    - node
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_term_node_revision.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_term_node_revision.yml
@@ -20,10 +20,3 @@ migration_dependencies:
   required:
     - d6_term_node
     - d6_node_revision
-dependencies:
-  config:
-    - migrate.migration.d6_node_revision
-    - migrate.migration.d6_term_node
-  module:
-    - migrate_drupal
-    - node
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_text_settings.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_text_settings.yml
@@ -11,7 +11,3 @@ process:
 destination:
   plugin: config
   config_name: text.settings
-dependencies:
-  module:
-    - migrate_drupal
-    - text
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_update_settings.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_update_settings.yml
@@ -19,7 +19,3 @@ process:
 destination:
   plugin: config
   config_name: update.settings
-dependencies:
-  module:
-    - migrate_drupal
-    - update
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_upload.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_upload.yml
@@ -25,10 +25,3 @@ migration_dependencies:
   required:
     - d6_file
     - d6_node
-dependencies:
-  config:
-    - migrate.migration.d6_file
-    - migrate.migration.d6_node
-  module:
-    - migrate_drupal
-    - node
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_upload_entity_display.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_upload_entity_display.yml
@@ -25,9 +25,3 @@ destination:
 migration_dependencies:
   required:
     - d6_upload_field_instance
-dependencies:
-  config:
-    - migrate.migration.d6_upload_field_instance
-  module:
-    - migrate_drupal
-    - node
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_upload_entity_form_display.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_upload_entity_form_display.yml
@@ -26,9 +26,3 @@ destination:
 migration_dependencies:
   required:
     - d6_upload_field_instance
-dependencies:
-  config:
-    - migrate.migration.d6_upload_field_instance
-  module:
-    - migrate_drupal
-    - node
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_upload_field.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_upload_field.yml
@@ -21,9 +21,3 @@ process:
   'settings/display_field': 'constants/display_field'
 destination:
   plugin: md_entity:field_storage_config
-dependencies:
-  module:
-    - field
-    - file
-    - migrate_drupal
-    - node
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_upload_field_instance.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_upload_field_instance.yml
@@ -22,11 +22,3 @@ migration_dependencies:
   required:
     - d6_upload_field
     - d6_node_type
-dependencies:
-  config:
-    - migrate.migration.d6_node_type
-    - migrate.migration.d6_upload_field
-  module:
-    - field
-    - migrate_drupal
-    - node
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_url_alias.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_url_alias.yml
@@ -19,9 +19,5 @@ process:
       - constants/slash
       - dst
   langcode: language
-
 destination:
   plugin: url_alias
-dependencies:
-  module:
-    - migrate_drupal
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user.yml
@@ -35,9 +35,3 @@ migration_dependencies:
     - d6_user_picture_file
     - d6_user_picture_entity_display
     - d6_user_picture_entity_form_display
-dependencies:
-  config:
-    - migrate.migration.d6_user_role
-  module:
-    - migrate_drupal
-    - user
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_contact_settings.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_contact_settings.yml
@@ -21,9 +21,3 @@ destination:
 migration_dependencies:
   required:
     - d6_user
-dependencies:
-  config:
-    - migrate.migration.d6_user
-  module:
-    - contact
-    - migrate_drupal
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_mail.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_mail.yml
@@ -37,7 +37,3 @@ process:
 destination:
   plugin: config
   config_name: user.mail
-dependencies:
-  module:
-    - migrate_drupal
-    - user
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_picture_entity_display.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_picture_entity_display.yml
@@ -28,9 +28,3 @@ destination:
 migration_dependencies:
   required:
     - d6_user_picture_field_instance
-dependencies:
-  config:
-    - migrate.migration.d6_user_picture_field_instance
-  module:
-    - migrate_drupal
-    - user
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_picture_entity_form_display.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_picture_entity_form_display.yml
@@ -27,9 +27,3 @@ destination:
 migration_dependencies:
   required:
     - d6_user_picture_field_instance
-dependencies:
-  config:
-    - migrate.migration.d6_user_picture_field_instance
-  module:
-    - migrate_drupal
-    - user
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_picture_field.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_picture_field.yml
@@ -18,9 +18,3 @@ process:
   cardinality: 'constants/cardinality'
 destination:
   plugin: md_entity:field_storage_config
-dependencies:
-  module:
-    - field
-    - image
-    - migrate_drupal
-    - user
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_picture_field_instance.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_picture_field_instance.yml
@@ -28,10 +28,3 @@ destination:
 migration_dependencies:
   required:
     - d6_user_picture_field
-dependencies:
-  config:
-    - migrate.migration.d6_user_picture_field
-  module:
-    - field
-    - migrate_drupal
-    - user
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_picture_file.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_picture_file.yml
@@ -24,7 +24,3 @@ migration_dependencies:
   # migration as an optional dependency to ensure it runs first.
   optional:
     - d6_file
-dependencies:
-  module:
-    - file
-    - migrate_drupal
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_profile_entity_display.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_profile_entity_display.yml
@@ -38,7 +38,3 @@ process:
       4: true # PROFILE_HIDDEN
 destination:
   plugin: component_entity_display
-dependencies:
-  module:
-    - migrate_drupal
-    - user
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_profile_entity_form_display.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_profile_entity_form_display.yml
@@ -47,7 +47,3 @@ process:
       4: true # PROFILE_HIDDEN
 destination:
   plugin: component_entity_form_display
-dependencies:
-  module:
-    - migrate_drupal
-    - user
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_profile_field.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_profile_field.yml
@@ -32,8 +32,3 @@ process:
       list: -1
 destination:
   plugin: md_entity:field_storage_config
-dependencies:
-  module:
-    - field
-    - migrate_drupal
-    - user
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_profile_field_instance.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_profile_field_instance.yml
@@ -19,10 +19,3 @@ destination:
 migration_dependencies:
   required:
     - d6_user_profile_field
-dependencies:
-  config:
-    - migrate.migration.d6_user_profile_field
-  module:
-    - field
-    - migrate_drupal
-    - user
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_role.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_role.yml
@@ -44,9 +44,3 @@ destination:
 migration_dependencies:
   required:
     - d6_filter_format
-dependencies:
-  config:
-    - migrate.migration.d6_filter_format
-  module:
-    - migrate_drupal
-    - user
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_settings.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_settings.yml
@@ -26,7 +26,3 @@ process:
 destination:
   plugin: config
   config_name: user.settings
-dependencies:
-  module:
-    - migrate_drupal
-    - user
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_view_modes.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_view_modes.yml
@@ -35,10 +35,5 @@ process:
       full: "Full"
   targetEntityType: 'constants/targetEntityType'
   status: 'constants/status'
-
 destination:
   plugin: entity:entity_view_mode
-dependencies:
-  module:
-    - migrate_drupal
-    - node
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_vocabulary_entity_display.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_vocabulary_entity_display.yml
@@ -26,9 +26,3 @@ destination:
 migration_dependencies:
   required:
     - d6_vocabulary_field_instance
-dependencies:
-  config:
-    - migrate.migration.d6_vocabulary_field_instance
-  module:
-    - migrate_drupal
-    - node
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_vocabulary_entity_form_display.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_vocabulary_entity_form_display.yml
@@ -24,9 +24,3 @@ destination:
 migration_dependencies:
   required:
     - d6_vocabulary_field_instance
-dependencies:
-  config:
-    - migrate.migration.d6_vocabulary_field_instance
-  module:
-    - migrate_drupal
-    - node
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_vocabulary_field.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_vocabulary_field.yml
@@ -23,11 +23,3 @@ destination:
 migration_dependencies:
   required:
     - d6_taxonomy_vocabulary
-dependencies:
-  config:
-    - migrate.migration.d6_taxonomy_vocabulary
-  module:
-    - entity_reference
-    - field
-    - migrate_drupal
-    - node
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_vocabulary_field_instance.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_vocabulary_field_instance.yml
@@ -23,10 +23,3 @@ destination:
 migration_dependencies:
   required:
     - d6_vocabulary_field
-dependencies:
-  config:
-    - migrate.migration.d6_vocabulary_field
-  module:
-    - field
-    - migrate_drupal
-    - node