reverted:
--- b/core/modules/action/src/Plugin/migrate/source/d6/Action.php
+++ a/core/modules/action/src/Plugin/migrate/source/d6/Action.php
@@ -12,7 +12,7 @@
 /**
  * Drupal 6 action source from database.
  *
+ * @MigrateSource(
- * @MigrateDrupalSource(
  *   id = "d6_action"
  * )
  */
only in patch2:
unchanged:
--- a/core/modules/action/src/Plugin/migrate/source/Action.php
+++ b/core/modules/action/src/Plugin/migrate/source/Action.php
@@ -13,7 +13,7 @@
 /**
  * Drupal action source from database.
  *
- * @MigrateSource(
+ * @MigrateDrupalSource(
  *   id = "action",
  *   source_provider = "system"
  * )
only in patch2:
unchanged:
--- a/core/modules/node/src/Plugin/migrate/D6NodeDeriver.php
+++ b/core/modules/node/src/Plugin/migrate/D6NodeDeriver.php
@@ -15,6 +15,7 @@
 use Drupal\migrate\Plugin\Migration;
 use Drupal\migrate\Plugin\MigrationDeriverTrait;
 use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
 
 /**
  * Deriver for Drupal 6 node and node revision migrations based on node types.
@@ -60,10 +61,16 @@ public function __construct($base_plugin_id, PluginManagerInterface $cck_manager
    * {@inheritdoc}
    */
   public static function create(ContainerInterface $container, $base_plugin_id) {
-    return new static(
-      $base_plugin_id,
-      $container->get('plugin.manager.migrate.cckfield')
-    );
+    try {
+      $cckfield_plugin_manager = $container->get('plugin.manager.migrate.cckfield');
+      return new static(
+        $base_plugin_id,
+        $cckfield_plugin_manager
+      );
+    }
+    catch (ServiceNotFoundException $e) {
+      return NULL;
+    }
   }
 
   /**
only in patch2:
unchanged:
--- a/core/modules/node/src/Plugin/migrate/D7NodeDeriver.php
+++ b/core/modules/node/src/Plugin/migrate/D7NodeDeriver.php
@@ -15,6 +15,7 @@
 use Drupal\migrate\Plugin\Migration;
 use Drupal\migrate\Plugin\MigrationDeriverTrait;
 use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
 
 /**
  * Deriver for Drupal 7 node and node revision migrations based on node types.
@@ -60,10 +61,17 @@ public function __construct($base_plugin_id, PluginManagerInterface $cck_manager
    * {@inheritdoc}
    */
   public static function create(ContainerInterface $container, $base_plugin_id) {
-    return new static(
-      $base_plugin_id,
-      $container->get('plugin.manager.migrate.cckfield')
-    );
+    try {
+      $cckfield_plugin_manager = $container->get('plugin.manager.migrate.cckfield');
+      return new static(
+        $base_plugin_id,
+        $cckfield_plugin_manager
+      );
+    }
+    catch (ServiceNotFoundException $e) {
+      return NULL;
+    }
+
   }
 
   /**