reverted:
--- b/core/modules/migrate_drupal/src/Plugin/MigrateCckFieldPluginManager.php
+++ a/core/modules/migrate_drupal/src/Plugin/MigrateCckFieldPluginManager.php
@@ -2,9 +2,6 @@
 
 namespace Drupal\migrate_drupal\Plugin;
 
-use Drupal\Component\Plugin\Exception\PluginNotFoundException;
-use Drupal\migrate\Plugin\MigrationInterface;
-
 @trigger_error('MigrateCckFieldPluginManager is deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.x. Use \Drupal\migrate_drupal\Annotation\MigrateFieldPluginManager instead.', E_USER_DEPRECATED);
 
 /**
diff -u b/core/modules/migrate_drupal/src/Plugin/MigrateFieldPluginManagerInterface.php b/core/modules/migrate_drupal/src/Plugin/MigrateFieldPluginManagerInterface.php
--- b/core/modules/migrate_drupal/src/Plugin/MigrateFieldPluginManagerInterface.php
+++ b/core/modules/migrate_drupal/src/Plugin/MigrateFieldPluginManagerInterface.php
@@ -48,2 +48,3 @@
   public function getDestinationModule($definition);
+
 }
diff -u b/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php b/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php
--- b/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php
+++ b/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php
@@ -2,7 +2,6 @@
 
 namespace Drupal\migrate_drupal_ui\Form;
 
-use Drupal\Component\Plugin\Exception\PluginNotFoundException;
 use Drupal\Core\Datetime\DateFormatterInterface;
 use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\Core\Form\ConfirmFormBase;
diff -u b/core/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeTestBase.php b/core/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeTestBase.php
--- b/core/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeTestBase.php
+++ b/core/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeTestBase.php
@@ -291,2 +291,3 @@
   abstract protected function getMissingPaths();
+
 }
diff -u b/core/modules/migrate_drupal_ui/tests/src/Functional/d6/MigrateUpgrade6Test.php b/core/modules/migrate_drupal_ui/tests/src/Functional/d6/MigrateUpgrade6Test.php
--- b/core/modules/migrate_drupal_ui/tests/src/Functional/d6/MigrateUpgrade6Test.php
+++ b/core/modules/migrate_drupal_ui/tests/src/Functional/d6/MigrateUpgrade6Test.php
@@ -80,7 +80,9 @@
    */
   public function getAvailablePaths() {
     return [
+      'aggregator',
       'block',
+      'book',
       'comment',
       'contact',
       'content',
@@ -98,6 +100,7 @@
       'link',
       'list',
       'menu',
+      'locale',
       'node',
       'node_reference',
       'number',
@@ -110,6 +113,7 @@
       'system',
       'taxonomy',
       'text',
+      'translation',
       'upload',
       'user',
       'user_reference',
@@ -121,8 +125,6 @@
    */
   public function getMissingPaths() {
     return [
-      'aggregator',
-      'book',
       'date_api',
       'date_timezone',
       'event',
@@ -134,9 +136,7 @@
       'i18nprofile',
       'i18nstrings',
       'imageapi',
-      'locale',
       'php',
-      'translation',
       'variable_admin',
     ];
   }
diff -u b/core/modules/migrate_drupal_ui/tests/src/Functional/d7/MigrateUpgrade7Test.php b/core/modules/migrate_drupal_ui/tests/src/Functional/d7/MigrateUpgrade7Test.php
--- b/core/modules/migrate_drupal_ui/tests/src/Functional/d7/MigrateUpgrade7Test.php
+++ b/core/modules/migrate_drupal_ui/tests/src/Functional/d7/MigrateUpgrade7Test.php
@@ -86,6 +86,7 @@
    */
   public function getAvailablePaths() {
     return [
+      'aggregator',
       'block',
       'comment',
       'contact',
@@ -98,10 +99,12 @@
       'file',
       'filefield',
       'filter',
+      'forum',
       'image',
       'imagefield',
       'link',
       'list',
+      'locale',
       'menu',
       'node',
       'node_reference',
@@ -112,11 +115,11 @@
       'phone',
       'search',
       'shortcut',
-      //'simpletest',
+      'statistics',
       'system',
       'taxonomy',
       'text',
-      //'update',
+      'translation',
       'user',
       'user_reference',
     ];
@@ -127,7 +130,6 @@
    */
   public function getMissingPaths() {
     return [
-      'aggregator',
       'blog',
       'book',
       'color',
@@ -135,17 +137,15 @@
       'date_api',
       'entity',
       'field_ui',
-      'forum',
       'help',
-      'locale',
       'php',
       'rdf',
-      'statistics',
+      'simpletest',
       'syslog',
       'toolbar',
       'tracker',
-      'translation',
       'trigger',
+      'update',
     ];
   }