Merged V4.1-BUG-FIX to HEAD

38298: Fix for ALF-13737 - Error when 'favoriting' Company Home
   38303: Fix for ALF-10688 - Can't deactivate an account
   38307: ALF-14583: Latest Surf libs (r1092) to update .tld files to comply to strict DTD
   38314: Merged V3.4-BUG-FIX to V4.1-BUG-FIX
      38313: Merged V3.4 to V3.4-BUG-FIX
         38257: ALF-14646: Log rotation is broken in 3.4.10
         - Use a different log4j log file for each web application
         38266: ALF-14769: Deployment Installer: Title for 'Confirm password' field is absent on 'User Account Details' form
         - Specified a descriptionRetype prompt
         38306: ALF-13751: Missing change concerning preserving the AUTH.ALF zone on rezoned groups as well as persons


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@38316 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/repo/security/sync/ChainingUserRegistrySynchronizer.java

@@ -873,9 +873,7 @@ public class ChainingUserRegistrySynchronizer extends AbstractLifecycleBean impl
                                     + "'. This group will in future be assumed to originate from user registry '"
                                     + zone + "'.");
                         }
-                        ChainingUserRegistrySynchronizer.this.authorityService.removeAuthorityFromZones(groupName,
-                                groupZones);
-                        ChainingUserRegistrySynchronizer.this.authorityService.addAuthorityToZones(groupName, zoneSet);
+                        updateAuthorityZones(groupName, groupZones, zoneSet);
 
                         // The group now exists in this zone: update the group
                         updateGroup(group, true);