revert unrelated changes that caused test failures

common/supplemental/likelySubtags.xml

@@ -964,8 +964,8 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<!--{ Southern Hindko; ?; ? } => { Southern Hindko; Arabic; Pakistan }-->
 		<likelySubtag from="hne" to="hne_Deva_IN"/>
 		<!--{ Chhattisgarhi; ?; ? } => { Chhattisgarhi; Devanagari; India }-->
-		<likelySubtag from="hnj" to="hnj_Hmng_LA"/>
-		<!--{ Hmong Njua; ?; ? } => { Hmong Njua; Pahawh Hmong; Laos }-->
+		<likelySubtag from="hnj" to="hnj_Hmnp_US"/>
+		<!--{ Hmong Njua; ?; ? } => { Hmong Njua; Nyiakeng Puachue Hmong; United States }-->
 		<likelySubtag from="hnn" to="hnn_Latn_PH"/>
 		<!--{ Hanunoo; ?; ? } => { Hanunoo; Latin; Philippines }-->
 		<likelySubtag from="hno" to="hno_Arab_PK"/>
@@ -1938,8 +1938,8 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<!--{ Orokolo; ?; ? } => { Orokolo; Latin; Unknown Region }-->
 		<likelySubtag from="oru" to="oru_Arab_ZZ"/>
 		<!--{ Ormuri; ?; ? } => { Ormuri; Arabic; Unknown Region }-->
-		<likelySubtag from="os" to="os_Cyrl_RU"/>
-		<!--{ Ossetic; ?; ? } => { Ossetic; Cyrillic; Russia }-->
+		<likelySubtag from="os" to="os_Cyrl_GE"/>
+		<!--{ Ossetic; ?; ? } => { Ossetic; Cyrillic; Georgia }-->
 		<likelySubtag from="osa" to="osa_Osge_US"/>
 		<!--{ Osage; ?; ? } => { Osage; Osage; United States }-->
 		<likelySubtag from="ota" to="ota_Arab_ZZ"/>
@@ -3324,6 +3324,8 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<!--{ ?; Arabic; India } => { Urdu; Arabic; India }-->
 		<likelySubtag from="und_Arab_KH" to="cja_Arab_KH"/>
 		<!--{ ?; Arabic; Cambodia } => { Western Cham; Arabic; Cambodia }-->
+		<likelySubtag from="und_Arab_MM" to="rhg_Arab_MM"/>
+		<!--{ ?; Arabic; Myanmar (Burma) } => { Rohingya; Arabic; Myanmar (Burma) }-->
 		<likelySubtag from="und_Arab_MN" to="kk_Arab_MN"/>
 		<!--{ ?; Arabic; Mongolia } => { Kazakh; Arabic; Mongolia }-->
 		<likelySubtag from="und_Arab_MU" to="ur_Arab_MU"/>
@@ -3386,6 +3388,8 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<!--{ ?; Coptic; ? } => { Coptic; Coptic; Egypt }-->
 		<likelySubtag from="und_Cpmn" to="und_Cpmn_CY"/>
 		<!--{ ?; Cypro-Minoan; ? } => { ?; Cypro-Minoan; Cyprus }-->
+		<likelySubtag from="und_Cpmn_CY" to="und_Cpmn_CY"/>
+		<!--{ ?; Cypro-Minoan; Cyprus } => { ?; Cypro-Minoan; Cyprus }-->
 		<likelySubtag from="und_Cprt" to="grc_Cprt_CY"/>
 		<!--{ ?; Cypriot; ? } => { Ancient Greek; Cypriot; Cyprus }-->
 		<likelySubtag from="und_Cyrl" to="ru_Cyrl_RU"/>
@@ -3394,8 +3398,8 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<!--{ ?; Cyrillic; Albania } => { Macedonian; Cyrillic; Albania }-->
 		<likelySubtag from="und_Cyrl_BA" to="sr_Cyrl_BA"/>
 		<!--{ ?; Cyrillic; Bosnia & Herzegovina } => { Serbian; Cyrillic; Bosnia & Herzegovina }-->
-		<likelySubtag from="und_Cyrl_GE" to="ab_Cyrl_GE"/>
-		<!--{ ?; Cyrillic; Georgia } => { Abkhazian; Cyrillic; Georgia }-->
+		<likelySubtag from="und_Cyrl_GE" to="os_Cyrl_GE"/>
+		<!--{ ?; Cyrillic; Georgia } => { Ossetic; Cyrillic; Georgia }-->
 		<likelySubtag from="und_Cyrl_GR" to="mk_Cyrl_GR"/>
 		<!--{ ?; Cyrillic; Greece } => { Macedonian; Cyrillic; Greece }-->
 		<likelySubtag from="und_Cyrl_MD" to="uk_Cyrl_MD"/>
@@ -3482,8 +3486,8 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<!--{ ?; Anatolian Hieroglyphs; ? } => { Hieroglyphic Luwian; Anatolian Hieroglyphs; Turkey }-->
 		<likelySubtag from="und_Hmng" to="hnj_Hmng_LA"/>
 		<!--{ ?; Pahawh Hmong; ? } => { Hmong Njua; Pahawh Hmong; Laos }-->
-		<likelySubtag from="und_Hmnp" to="mww_Hmnp_US"/>
-		<!--{ ?; Nyiakeng Puachue Hmong; ? } => { Hmong Daw; Nyiakeng Puachue Hmong; United States }-->
+		<likelySubtag from="und_Hmnp" to="hnj_Hmnp_US"/>
+		<!--{ ?; Nyiakeng Puachue Hmong; ? } => { Hmong Njua; Nyiakeng Puachue Hmong; United States }-->
 		<likelySubtag from="und_Hung" to="hu_Hung_HU"/>
 		<!--{ ?; Old Hungarian; ? } => { Hungarian; Old Hungarian; Hungary }-->
 		<likelySubtag from="und_Ital" to="ett_Ital_IT"/>

common/supplemental/supplementalMetadata.xml

@@ -1695,16 +1695,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<defaultContent locales="
 			aa_ET ab_GE af_ZA agq_CM ak_GH am_ET an_ES ar_001 arn_CL as_IN asa_TZ ast_ES
 			az_Arab_IR az_Cyrl_AZ az_Latn az_Latn_AZ
-			ba_RU bal_Arab bal_Arab_PK bal_Latn_PK bas_CM be_BY bem_ZM bez_TZ bg_BG bgn_PK
-			blt_VN bm_ML bm_Nkoo_ML bn_BD bo_CN br_FR brx_IN bs_Cyrl_BA bs_Latn bs_Latn_BA
-			bss_CM byn_ER
+			ba_RU bal_Arab bal_Arab_PK bal_Latn_PK bas_CM be_BY bem_ZM bez_TZ bg_BG bgn_PK blt_VN bm_ML bm_Nkoo_ML bn_BD
+			bo_CN br_FR brx_IN bs_Cyrl_BA bs_Latn bs_Latn_BA bss_CM byn_ER
 			ca_ES cad_US cch_NG ccp_BD ce_RU ceb_PH cgg_UG chr_US cic_US ckb_IQ co_FR cs_CZ
 			cu_RU cv_RU cy_GB
 			da_DK dav_KE de_DE dje_NE doi_IN dsb_DE dua_CM dv_MV dyo_SN dz_BT
 			ebu_KE ee_GH el_GR en_Dsrt_US en_US eo_001 es_ES et_EE eu_ES ewo_CM
 			fa_IR ff_Adlm_GN ff_Latn ff_Latn_SN fi_FI fil_PH fo_FO fr_FR fur_IT fy_NL
 			ga_IE gaa_GH gd_GB gez_ET gl_ES gn_PY gsw_CH gu_IN guz_KE gv_IM
-			ha_Arab_NG ha_NG haw_US he_IL hi_IN hi_Latn_IN hr_HR hsb_DE hu_HU hy_AM
+			ha_Arab_NG ha_NG haw_US he_IL hi_IN hi_Latn_IN hnj_Hmnp hnj_Hmnp_US hr_HR
+			hsb_DE hu_HU hy_AM
 			ia_001 id_ID ife_TG ig_NG ii_CN io_001 is_IS it_IT iu_CA iu_Latn_CA
 			ja_JP jbo_001 jgo_CM jmc_TZ jv_ID
 			ka_GE kab_DZ kaj_NG kam_KE kcg_NG kde_TZ kea_CV ken_CM kgp_BR khq_ML ki_KE
@@ -1717,7 +1717,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			mua_CM mus_US my_MM myv_RU mzn_IR
 			naq_NA nb nb_NO nd_ZW nds_DE ne_NP nl_NL nmg_CM nn_NO nnh_CM nqo_GN nr_ZA
 			nso_ZA nus_SS nv_US ny_MW nyn_UG
-			oc_FR om_ET or_IN os_RU osa_US
+			oc_FR om_ET or_IN os_GE osa_US
 			pa_Arab_PK pa_Guru pa_Guru_IN pcm_NG pl_PL prg_001 ps_AF pt_BR
 			qu_PE quc_GT
 			rhg_Rohg rhg_Rohg_MM rm_CH rn_BI ro_RO rof_TZ ru_RU rw_RW rwk_TZ