reverted:
--- b/core/modules/config_translation/src/Tests/Migrate/d6/Migratei18nUserProfileFieldInstanceTest.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\config_translation\Tests\Migrate\d6\Migratei18nUserProfileFieldInstanceTest.
- */
-
-namespace Drupal\config_translation\Tests\Migrate\d6;
-
-use Drupal\field\Entity\FieldConfig;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-
-/**
- * Tests the user profile field instance migration.
- *
- * @group migrate_drupal_6
- */
-class Migratei18nUserProfileFieldInstanceTest extends MigrateDrupal6TestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['config_translation', 'locale', 'language', 'field'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->executeMigrations([
-      'user_profile_field',
-      'user_profile_field_instance',
-      'i18n_user_profile_field_instance',
-    ]);
-  }
-
-  /**
-   * Tests migration of translated user profile fields.
-   */
-  public function testUserProfileFields() {
-    $config_translation = \Drupal::service('language_manager')->getLanguageConfigOverride('fr', 'field.field.user.user.profile_love_migrations');
-    $this->assertIdentical("J'aime les migrations", $config_translation->get('label'));
-    $this->assertIdentical("Si vous cochez cette case, vous aimez les migrations.", $config_translation->get('description'));
-    $config_translation = \Drupal::service('language_manager')->getLanguageConfigOverride('fr', 'field.field.user.user.profile_color');
-    $this->assertIdentical('fr - Favorite color', $config_translation->get('label'));
-    $this->assertIdentical('Inscrivez votre couleur préférée', $config_translation->get('description'));
-    $config_translation = \Drupal::service('language_manager')->getLanguageConfigOverride('fr', 'field.field.user.user.profile_biography');
-    $this->assertIdentical('fr - Biography', $config_translation->get('label'));
-    $this->assertIdentical('fr - Tell people a little bit about yourself', $config_translation->get('description'));
-    $config_translation = \Drupal::service('language_manager')->getLanguageConfigOverride('fr', 'field.field.user.user.profile_sell_address');
-    $this->assertIdentical('fr - Sell your email address?', $config_translation->get('label'));
-    $this->assertIdentical("fr - If you check this box, we'll sell your address to spammers to help line the pockets of our shareholders. Thanks!", $config_translation->get('description'));
-    $config_translation = \Drupal::service('language_manager')->getLanguageConfigOverride('fr', 'field.field.user.user.profile_sold_to');
-    $this->assertIdentical('fr - Sales Category', $config_translation->get('label'));
-    $this->assertIdentical("fr - Select the sales categories to which this user's address was sold.", $config_translation->get('description'));
-    $this->assertIdentical('fr - Pill spammers Fitness spammers Back\slash Forward/slash Dot.in.the.middle', $config_translation->get('options'));
-    $config_translation = \Drupal::service('language_manager')->getLanguageConfigOverride('fr', 'field.field.user.user.profile_bands');
-    $this->assertIdentical('Mes groupes préférés', $config_translation->get('label'));
-    $this->assertIdentical("fr - Enter your favorite bands. When you've saved your profile, you'll be able to find other people with the same favorites.", $config_translation->get('description'));
-    $config_translation = \Drupal::service('language_manager')->getLanguageConfigOverride('fr', 'field.field.user.user.profile_birthdate');
-    $this->assertIdentical('fr - Birthdate', $config_translation->get('label'));
-    $this->assertIdentical('fr - Enter your birth date and we\'ll send you a coupon.', $config_translation->get('description'));
-    $config_translation = \Drupal::service('language_manager')->getLanguageConfigOverride('fr', 'field.field.user.user.profile_blog');
-    $this->assertIdentical('fr - Blog', $config_translation->get('label'));
-    $this->assertIdentical('fr - Paste the full URL, including http://, of your personal blog.', $config_translation->get('description'));
-  }
-
-}
diff -u b/core/modules/migrate/src/Plugin/migrate/destination/EntityConfigBase.php b/core/modules/migrate/src/Plugin/migrate/destination/EntityConfigBase.php
--- b/core/modules/migrate/src/Plugin/migrate/destination/EntityConfigBase.php
+++ b/core/modules/migrate/src/Plugin/migrate/destination/EntityConfigBase.php
@@ -12,7 +12,7 @@
 use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Language\LanguageManagerInterface;
 use Drupal\language\ConfigurableLanguageManagerInterface;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\MigrateException;
 use Drupal\migrate\Plugin\MigrateIdMapInterface;
 use Drupal\migrate\Row;
@@ -38,7 +38,6 @@
   protected $languageManager;
 
   /**
-  /**
    * Construct a new entity.
    *
    * @param array $configuration
diff -u b/core/modules/migrate_drupal/src/Plugin/migrate/destination/EntityFieldStorageConfig.php b/core/modules/migrate_drupal/src/Plugin/migrate/destination/EntityFieldStorageConfig.php
--- b/core/modules/migrate_drupal/src/Plugin/migrate/destination/EntityFieldStorageConfig.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/destination/EntityFieldStorageConfig.php
@@ -24,13 +24,6 @@
 class EntityFieldStorageConfig extends BaseEntityFieldStorageConfig {
 
   /**
-   * The language manager.
-   *
-   * @var \Drupal\Core\Language\LanguageManagerInterface
-   */
-  protected $languageManager;
-
-  /**
    * The field type plugin manager.
    *
    * @var \Drupal\Core\Field\FieldTypePluginManagerInterface
@@ -52,13 +45,13 @@
    *   The storage for this entity type.
    * @param array $bundles
    *   The list of bundles this entity type has.
-   * @param \Drupal\Core\Language\LanguageManagerInterface $language_manager
+   * @param LanguageManagerInterface $language_manager
    *   The language manager.
    * @param \Drupal\Core\Field\FieldTypePluginManagerInterface $field_type_plugin_manager
    *   The field type plugin manager.
    */
   public function __construct(array $configuration, $plugin_id, $plugin_definition, MigrationInterface $migration, EntityStorageInterface $storage, array $bundles, LanguageManagerInterface $language_manager, FieldTypePluginManagerInterface $field_type_plugin_manager) {
-    parent::__construct($configuration, $plugin_id, $plugin_definition, $migration, $storage, $bundles, $language_manager);
+    parent::__construct($configuration, $plugin_id, $plugin_definition, $migration, $storage, $bundles, $language_manager, $field_type_plugin_manager);
     $this->languageManager = $language_manager;
     $this->fieldTypePluginManager = $field_type_plugin_manager;
   }
only in patch2:
unchanged:
--- /dev/null
+++ b/core/modules/config_translation/tests/src/Kernel/Migrate/d6/Migratei18nUserProfileFieldInstanceTest.php
@@ -0,0 +1,68 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\config_translation\Kernel\Migrate\d6\Migratei18nUserProfileFieldInstanceTest.
+ */
+
+namespace Drupal\Tests\config_translation\Kernel\Migrate\d6;
+
+use Drupal\field\Entity\FieldConfig;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+
+/**
+ * Tests the user profile field instance migration.
+ *
+ * @group migrate_drupal_6
+ */
+class Migratei18nUserProfileFieldInstanceTest extends MigrateDrupal6TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['config_translation', 'locale', 'language', 'field'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->executeMigrations([
+      'user_profile_field',
+      'user_profile_field_instance',
+      'i18n_user_profile_field_instance',
+    ]);
+  }
+
+  /**
+   * Tests migration of translated user profile fields.
+   */
+  public function testUserProfileFields() {
+    $config_translation = \Drupal::service('language_manager')->getLanguageConfigOverride('fr', 'field.field.user.user.profile_love_migrations');
+    $this->assertIdentical("J'aime les migrations", $config_translation->get('label'));
+    $this->assertIdentical("Si vous cochez cette case, vous aimez les migrations.", $config_translation->get('description'));
+    $config_translation = \Drupal::service('language_manager')->getLanguageConfigOverride('fr', 'field.field.user.user.profile_color');
+    $this->assertIdentical('fr - Favorite color', $config_translation->get('label'));
+    $this->assertIdentical('Inscrivez votre couleur préférée', $config_translation->get('description'));
+    $config_translation = \Drupal::service('language_manager')->getLanguageConfigOverride('fr', 'field.field.user.user.profile_biography');
+    $this->assertIdentical('fr - Biography', $config_translation->get('label'));
+    $this->assertIdentical('fr - Tell people a little bit about yourself', $config_translation->get('description'));
+    $config_translation = \Drupal::service('language_manager')->getLanguageConfigOverride('fr', 'field.field.user.user.profile_sell_address');
+    $this->assertIdentical('fr - Sell your email address?', $config_translation->get('label'));
+    $this->assertIdentical("fr - If you check this box, we'll sell your address to spammers to help line the pockets of our shareholders. Thanks!", $config_translation->get('description'));
+    $config_translation = \Drupal::service('language_manager')->getLanguageConfigOverride('fr', 'field.field.user.user.profile_sold_to');
+    $this->assertIdentical('fr - Sales Category', $config_translation->get('label'));
+    $this->assertIdentical("fr - Select the sales categories to which this user's address was sold.", $config_translation->get('description'));
+    $this->assertIdentical('fr - Pill spammers Fitness spammers Back\slash Forward/slash Dot.in.the.middle', $config_translation->get('options'));
+    $config_translation = \Drupal::service('language_manager')->getLanguageConfigOverride('fr', 'field.field.user.user.profile_bands');
+    $this->assertIdentical('Mes groupes préférés', $config_translation->get('label'));
+    $this->assertIdentical("fr - Enter your favorite bands. When you've saved your profile, you'll be able to find other people with the same favorites.", $config_translation->get('description'));
+    $config_translation = \Drupal::service('language_manager')->getLanguageConfigOverride('fr', 'field.field.user.user.profile_birthdate');
+    $this->assertIdentical('fr - Birthdate', $config_translation->get('label'));
+    $this->assertIdentical('fr - Enter your birth date and we\'ll send you a coupon.', $config_translation->get('description'));
+    $config_translation = \Drupal::service('language_manager')->getLanguageConfigOverride('fr', 'field.field.user.user.profile_blog');
+    $this->assertIdentical('fr - Blog', $config_translation->get('label'));
+    $this->assertIdentical('fr - Paste the full URL, including http://, of your personal blog.', $config_translation->get('description'));
+  }
+
+}