Merge remote-tracking branch 'upstream/v2' into v2

Author: adorton-adobe

user_sync/rules.py

@@ -1261,7 +1261,7 @@ def add_mapped_group(self, group):
     def add_additional_group(self, rename_group, member_group):
         normalized_rename_group = normalize_string(rename_group)
         if member_group not in self.additional_group_map[normalized_rename_group]:
-            self.additional_group_map[normalize_string(normalized_rename_group)].append(member_group)
+            self.additional_group_map[normalized_rename_group].append(member_group)
 
     def get_additional_group_map(self):
         return self.additional_group_map