canonicalize needles JSON and fix conflict

needles/anaconda/identification/rocky-leftbar_generic-20210805.json

@@ -10,6 +10,7 @@
   ],
   "properties": [],
   "tags": [
+    "ENV-DISTRI-rocky",
     "leftbar_generic"
   ]
 }

needles/anaconda/identification/rocky-leftbar_server-20210809.json

@@ -10,6 +10,7 @@
   ],
   "properties": [],
   "tags": [
+    "ENV-DISTRI-rocky",
     "leftbar_server"
   ]
 }

needles/anaconda/identification/rocky-topbar_generic-20210807.json

@@ -10,6 +10,7 @@
   ],
   "properties": [],
   "tags": [
+    "ENV-DISTRI-rocky",
     "topbar_generic"
   ]
 }

needles/anaconda/lang_select/rocky-install_lang_english_selected-20210805.json

@@ -10,6 +10,7 @@
   ],
   "properties": [],
   "tags": [
+    "ENV-DISTRI-rocky",
     "anaconda_select_install_lang_selected",
     "anaconda_select_install_lang_filtered",
     "LANGUAGE-english"

needles/anaconda/main_hub/rocky-boot_to_anaconda-version_8.4_ident-20210805.json

@@ -10,6 +10,7 @@
   ],
   "properties": [],
   "tags": [
+    "ENV-DISTRI-rocky",
     "version_8.4_ident"
   ]
 }

needles/anaconda/main_hub/rocky-boot_to_anaconda-version_8_ident.json

@@ -10,6 +10,7 @@
   ],
   "properties": [],
   "tags": [
+    "ENV-DISTRI-rocky",
     "version_8_ident"
   ]
 }

needles/anaconda/main_hub/rocky-boot_to_anaconda-version_greenobsidian_ident-20210807.json

@@ -10,6 +10,7 @@
   ],
   "properties": [],
   "tags": [
+    "ENV-DISTRI-rocky",
     "version_greenobsidian_ident"
   ]
-}
+}

needles/anaconda/partitioning/rocky-fs_ext4-20210813.json

@@ -10,6 +10,7 @@
   ],
   "properties": [],
   "tags": [
+    "ENV-DISTRI-rocky",
     "anaconda_part_fs_ext4"
   ]
 }

needles/anaconda/partitioning/rocky-fs_ext4_preselected-20210812.json

@@ -12,6 +12,6 @@
   "tags": [
     "anaconda_part_fs",
     "anaconda_part_fs_ext4_selected",
-    "ENV-DISTRI-fedora"
+    "ENV-DISTRI-rocky",
   ]
 }

needles/anaconda/partitioning/rocky-fs_xfs_preselected-20210812.json

@@ -10,7 +10,7 @@
   ],
   "properties": [],
   "tags": [
-    "ENV-DISTRI-fedora",
+    "ENV-DISTRI-rocky",
     "anaconda_part_fs",
     "anaconda_part_fs_xfs_selected"
   ]

needles/anaconda/partitioning/rocky-manual_partitioning-20210812.json

@@ -10,7 +10,7 @@
   ],
   "properties": [],
   "tags": [
-    "DISTRI-rocky",
+    "ENV-DISTRI-rocky",
     "LANGUAGE-english",
     "anaconda_manual_partitioning"
   ]

needles/cockpit/rocky-autoupdate_planned_day-20210814.json

@@ -10,6 +10,7 @@
   ],
   "properties": [],
   "tags": [
+    "ENV-DISTRI-rocky",
     "autoupdate_planned_day"
   ]
 }

needles/cockpit/rocky-cockpit_login-20210814.json

@@ -10,6 +10,7 @@
   ],
   "properties": [],
   "tags": [
+    "ENV-DISTRI-rocky",
     "cockpit_login"
   ]
 }

needles/cockpit/rocky-cockpit_updates_auto_all-20210814.json

@@ -14,6 +14,7 @@
   ],
   "properties": [],
   "tags": [
+    "ENV-DISTRI-rocky",
     "cockpit_updates_auto_all"
   ]
 }

needles/console/rocky-bootloader-bios-20210805.json

@@ -10,6 +10,7 @@
   ],
   "properties": [],
   "tags": [
+    "ENV-DISTRI-rocky",
     "bootloader",
     "bootloader_bios"
   ]