Merged V2.2 to HEAD

8357: Fixed code that would break in UI cluster.
  8402: Fix for AWC-1915

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

source/java/org/alfresco/web/bean/groups/AddUsersDialog.java

@@ -171,7 +171,11 @@ public class AddUsersDialog extends BaseDialogBean
          this.usersDataModel = new ListDataModel();
       }
 
-      this.usersDataModel.setWrappedData(this.usersForGroup);
+      // only set the wrapped data once otherwise the rowindex is reset
+      if (this.usersDataModel.getWrappedData() == null)
+      {
+         this.usersDataModel.setWrappedData(this.usersForGroup);
+      }
 
       return this.usersDataModel;
    }