Merged 2.2 to HEAD

8729: Fix for AWC-1957 & AWC-1962 (Administrator is unable to add any user to "Selected users/groups and their role(s)" list)

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

source/java/org/alfresco/web/bean/search/AdvancedSearchDialog.java

@@ -312,6 +312,7 @@ public class AdvancedSearchDialog extends BaseDialogBean
       properties.setLocation(null);
       properties.setLocationChildren(true);
       properties.setCategories(new ArrayList<Node>(2));
+      properties.setCategoriesDataModel(null);
       properties.setTitle(null);
       properties.setDescription(null);
       properties.setAuthor(null);