Issue #2630578 by mikeryan, jonhattan, Matt B: Formats duplicated in D6 upgrade

core/modules/filter/migration_templates/d6_filter_format.yml

@@ -6,14 +6,8 @@ source:
   plugin: d6_filter_format
 process:
   format:
-    -
+    plugin: machine_name
-      plugin: machine_name
+    source: name
-      source: name
-    -
-      plugin: dedupe_entity
-      entity_type: filter_format
-      field: format
-      length: 32
   name: name
   cache: cache
   filters:

core/modules/migrate_drupal_ui/src/Tests/d6/MigrateUpgrade6Test.php

@@ -43,7 +43,7 @@ class MigrateUpgrade6Test extends MigrateUpgradeTestBase {
       'field_config' => 62,
       'field_storage_config' => 43,
       'file' => 7,
-      'filter_format' => 8,
+      'filter_format' => 7,
       'image_style' => 5,
       'migration' => 105,
       'node' => 9,