500c500
< index f17768ef3b..ab086c71c2 100644
---
> index 8cb60347bc..b487c18c8d 100644
503,504c503,504
< @@ -102,6 +102,25 @@ protected function getMigrations($database_state_key, $drupal_version) {
<      $plugin_manager = \Drupal::service('plugin.manager.migration');
---
> @@ -123,6 +123,25 @@ protected function getMigrations($database_state_key, $drupal_version) {
>      $version_tag = 'Drupal ' . $drupal_version;
506c506
<      $all_migrations = $plugin_manager->createInstancesByTag($version_tag);
---
>      $all_migrations = $this->getMigrationPluginManager()->createInstancesByTag($version_tag);
529,530c529,530
< @@ -210,4 +229,24 @@ protected function getLegacyDrupalVersion(Connection $connection) {
<      return $version_string ? substr($version_string, 0, 1) : FALSE;
---
> @@ -273,4 +292,24 @@ protected function getState() {
>      return $this->state;
913c913
< index 474fa79afc..6c2ee07fe7 100644
---
> index 905c9ee32d..8e4bc01ea1 100644
1744c1744
< @@ -40660,14 +41033,14 @@
---
> @@ -40628,14 +41001,14 @@
1761c1761
< @@ -40676,14 +41049,14 @@
---
> @@ -40644,14 +41017,14 @@
1778c1778
< @@ -40692,14 +41065,14 @@
---
> @@ -40660,14 +41033,14 @@
1795c1795
< @@ -40708,14 +41081,14 @@
---
> @@ -40676,14 +41049,14 @@
1812c1812
< @@ -41177,9 +41550,9 @@
---
> @@ -41145,9 +41518,9 @@
1825c1825
< @@ -41189,9 +41562,9 @@
---
> @@ -41157,9 +41530,9 @@
1838c1838
< @@ -41201,8 +41574,8 @@
---
> @@ -41169,8 +41542,8 @@
1849c1849
< @@ -41213,9 +41586,9 @@
---
> @@ -41181,9 +41554,9 @@
1862c1862
< @@ -41281,6 +41654,54 @@
---
> @@ -41249,6 +41622,54 @@
1921c1921
< index 474fa79afc..2e3742f888 100644
---
> index 905c9ee32d..2e3742f888 100644
2752c2752,2955
< @@ -40660,14 +41033,14 @@
---
> @@ -18790,8 +19163,16 @@
>    'i18n_status' => '0',
>  ))
>  ->values(array(
> -  'lid' => '87',
> -  'translation' => 'fr - VocabFixed',
> +  'lid' => '85',
> +  'translation' => 'fr - VocabLocalized',
> +  'language' => 'fr',
> +  'plid' => '0',
> +  'plural' => '0',
> +  'i18n_status' => '0',
> +))
> +->values(array(
> +  'lid' => '86',
> +  'translation' => 'fr - Vocabulary localize option',
>    'language' => 'fr',
>    'plid' => '0',
>    'plural' => '0',
> @@ -18799,7 +19180,7 @@
>  ))
>  ->values(array(
>    'lid' => '89',
> -  'translation' => 'fr - VocabLocalized',
> +  'translation' => 'fr - VocabFixed',
>    'language' => 'fr',
>    'plid' => '0',
>    'plural' => '0',
> @@ -18807,7 +19188,39 @@
>  ))
>  ->values(array(
>    'lid' => '90',
> -  'translation' => 'fr - Vocabulary localize option',
> +  'translation' => 'fr - Vocabulary fixed option',
> +  'language' => 'fr',
> +  'plid' => '0',
> +  'plural' => '0',
> +  'i18n_status' => '0',
> +))
> +->values(array(
> +  'lid' => '91',
> +  'translation' => 'fr - Jupiter Station',
> +  'language' => 'fr',
> +  'plid' => '0',
> +  'plural' => '0',
> +  'i18n_status' => '0',
> +))
> +->values(array(
> +  'lid' => '92',
> +  'translation' => 'fr - Holographic research.',
> +  'language' => 'fr',
> +  'plid' => '0',
> +  'plural' => '0',
> +  'i18n_status' => '0',
> +))
> +->values(array(
> +  'lid' => '93',
> +  'translation' => 'fr - DS9',
> +  'language' => 'fr',
> +  'plid' => '0',
> +  'plural' => '0',
> +  'i18n_status' => '0',
> +))
> +->values(array(
> +  'lid' => '94',
> +  'translation' => 'Terok Nor',
>    'language' => 'fr',
>    'plid' => '0',
>    'plural' => '0',
> @@ -18827,7 +19240,7 @@
>    'language' => 'fr',
>    'plid' => '0',
>    'plural' => '0',
> -  'i18n_status' => '1',
> +  'i18n_status' => '0',
>  ))
>  ->values(array(
>    'lid' => '163',
> @@ -18843,7 +19256,7 @@
>    'language' => 'fr',
>    'plid' => '0',
>    'plural' => '0',
> -  'i18n_status' => '1',
> +  'i18n_status' => '0',
>  ))
>  ->values(array(
>    'lid' => '684',
> @@ -18851,7 +19264,7 @@
>    'language' => 'fr',
>    'plid' => '0',
>    'plural' => '0',
> -  'i18n_status' => '1',
> +  'i18n_status' => '0',
>  ))
>  ->values(array(
>    'lid' => '761',
> @@ -18942,23 +19355,23 @@
>    'i18n_status' => '0',
>  ))
>  ->values(array(
> -  'lid' => '89',
> -  'translation' => 'is - VocabLocalized',
> +  'lid' => '687',
> +  'translation' => 'is - Off',
>    'language' => 'is',
>    'plid' => '0',
>    'plural' => '0',
>    'i18n_status' => '0',
>  ))
>  ->values(array(
> -  'lid' => '90',
> -  'translation' => 'is - Vocabulary localize option',
> +  'lid' => '688',
> +  'translation' => 'is - 1',
>    'language' => 'is',
>    'plid' => '0',
>    'plural' => '0',
>    'i18n_status' => '0',
>  ))
>  ->values(array(
> -  'lid' => '91',
> +  'lid' => '87',
>    'translation' => 'is - VocabTranslate',
>    'language' => 'is',
>    'plid' => '0',
> @@ -18966,7 +19379,7 @@
>    'i18n_status' => '0',
>  ))
>  ->values(array(
> -  'lid' => '92',
> +  'lid' => '88',
>    'translation' => 'is - Vocabulary translate option',
>    'language' => 'is',
>    'plid' => '0',
> @@ -18974,56 +19387,48 @@
>    'i18n_status' => '0',
>  ))
>  ->values(array(
> -  'lid' => '95',
> -  'translation' => 'is - Some helpful text.',
> -  'language' => 'is',
> -  'plid' => '0',
> -  'plural' => '0',
> -  'i18n_status' => '0',
> -))
> -->values(array(
> -  'lid' => '96',
> -  'translation' => 'is - Email',
> +  'lid' => '93',
> +  'translation' => 'is - DS9',
>    'language' => 'is',
>    'plid' => '0',
>    'plural' => '0',
>    'i18n_status' => '0',
>  ))
>  ->values(array(
> -  'lid' => '97',
> -  'translation' => 'is - The email help text.',
> +  'lid' => '94',
> +  'translation' => 'is - Terok Nor',
>    'language' => 'is',
>    'plid' => '0',
>    'plural' => '0',
>    'i18n_status' => '0',
>  ))
>  ->values(array(
> -  'lid' => '128',
> -  'translation' => 'is - Term Reference',
> +  'lid' => '95',
> +  'translation' => 'is - Some helpful text.',
>    'language' => 'is',
>    'plid' => '0',
>    'plural' => '0',
>    'i18n_status' => '0',
>  ))
>  ->values(array(
> -  'lid' => '687',
> -  'translation' => 'is - Off',
> +  'lid' => '96',
> +  'translation' => 'is - Email',
>    'language' => 'is',
>    'plid' => '0',
>    'plural' => '0',
>    'i18n_status' => '0',
>  ))
>  ->values(array(
> -  'lid' => '688',
> -  'translation' => 'is - 1',
> +  'lid' => '97',
> +  'translation' => 'is - The email help text.',
>    'language' => 'is',
>    'plid' => '0',
>    'plural' => '0',
>    'i18n_status' => '0',
>  ))
>  ->values(array(
> -  'lid' => '758',
> -  'translation' => 'is field - vocab_localize',
> +  'lid' => '128',
> +  'translation' => 'is - Term Reference',
>    'language' => 'is',
>    'plid' => '0',
>    'plural' => '0',
> @@ -40628,14 +41033,14 @@
2769c2972
< @@ -40676,14 +41049,14 @@
---
> @@ -40644,14 +41049,14 @@
2786c2989
< @@ -40692,14 +41065,14 @@
---
> @@ -40660,14 +41065,14 @@
2803c3006
< @@ -40708,14 +41081,14 @@
---
> @@ -40676,14 +41081,14 @@
2820c3023
< @@ -41177,9 +41550,9 @@
---
> @@ -41145,9 +41550,9 @@
2833c3036
< @@ -41189,9 +41562,9 @@
---
> @@ -41157,9 +41562,9 @@
2846c3049
< @@ -41201,8 +41574,8 @@
---
> @@ -41169,8 +41574,8 @@
2857c3060
< @@ -41213,9 +41586,9 @@
---
> @@ -41181,9 +41586,9 @@
2870c3073
< @@ -41281,6 +41654,54 @@
---
> @@ -41249,6 +41654,54 @@
2925c3128
< @@ -52727,7 +53148,7 @@
---
> @@ -52695,7 +53148,7 @@
3026c3229
< index 2492143abc..d7c15b87d7 100644
---
> index ec58b94081..5993571b7b 100644
3029c3232,3233
< @@ -4,6 +4,7 @@
---
> @@ -3,6 +3,7 @@
>  namespace Drupal\migrate_drupal_ui\Form;
3032d3235
<  use Drupal\Core\TempStore\PrivateTempStoreFactory;
3036,3037c3239,3240
<  use Drupal\migrate\Plugin\MigrationPluginManagerInterface;
< @@ -73,6 +74,51 @@ public function buildForm(array $form, FormStateInterface $form_state) {
---
>  
> @@ -40,6 +41,51 @@ public function buildForm(array $form, FormStateInterface $form_state) {
4462c4665
< index 131219a710..422905a7bf 100644
---
> index 9dbfb54126..31571be5cc 100644
4465c4668
< @@ -31,18 +31,18 @@ public function testNodeRevision() {
---
> @@ -66,17 +66,17 @@ public function testNodeRevision() {
4481,4488c4684,4706
<      $node = \Drupal::entityTypeManager()->getStorage('node')->loadRevision(5);
<      $this->assertIdentical('1', $node->id());
< -    $this->assertIdentical('body test rev 3', $node->body->value);
< +    $this->assertIdentical('body test rev 2', $node->body->value);
<      $this->assertIdentical('1', $node->getRevisionUser()->id());
< -    $this->assertIdentical('modified rev 3', $node->revision_log->value);
< +    $this->assertIdentical('modified rev 2', $node->revision_log->value);
<      $this->assertIdentical('1390095703', $node->getRevisionCreationTime());
---
> -    $this->assertRevision(1, 'und', 'Test title', NULL, '1420861423');
> +    $this->assertRevision(1, 'und', 'Test title', NULL, '1390095702');
>      $this->assertRevision(3, 'und', 'Test title rev 3', NULL, '1420718386');
>      $this->assertRevision(4, 'und', 'Test page title rev 4', NULL, '1390095701');
> -    $this->assertRevision(5, 'und', 'Test title rev 3', 'modified rev 3', '1390095703');
> +    $this->assertRevision(5, 'und', 'Test title rev 2', 'modified rev 2', '1390095703');
>      $this->assertRevision(6, 'und', 'Node 4', NULL, '1390095701');
>      $this->assertRevision(7, 'und', 'Node 5', NULL, '1390095701');
>      $this->assertRevision(8, 'und', 'Node 6', NULL, '1390095701');
> @@ -92,7 +92,7 @@ public function testNodeRevision() {
>      $this->assertRevision(20, 'und', 'Ferengi Commerce Authority', NULL, '1493066693');
>      $this->assertRevision(21, 'und', 'Ambassador Sarek', NULL, '1494966544');
>      $this->assertRevision(22, 'und', 'New Forum Topic', NULL, '1501955771');
> -    $this->assertRevision(2001, 'und', 'Test title rev 2', 'modified rev 2', '1390095702');
> +    $this->assertRevision(2001, 'und', 'Test title rev 3', 'modified rev 3', '1420861423');
>      $this->assertRevision(2002, 'en', 'John Smith - EN', NULL, '1534014650');
>  
>      // Test that the revision translations are not migrated and there should not
> @@ -101,6 +101,7 @@ public function testNodeRevision() {
>      foreach ($ids as $id) {
>        $this->assertNull($this->nodeStorage->loadRevision($id));
>      }
> +
4490a4709
>  }
5435c5654
< index bd8ab3f459..f602837e18 100644
---
> index 36fd9b0b42..ca6e4e952a 100644
5438,5439c5657
< @@ -4,7 +4,7 @@
<  
---
> @@ -5,7 +5,7 @@
5440a5659
>  use Drupal\taxonomy\Entity\Term;
5447c5666
< @@ -13,7 +13,7 @@
---
> @@ -14,7 +14,7 @@