Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

107541: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE)
      107413: Merged DEV to 5.0.N (5.0.3)
         106858 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Cleaning of Javadoc,
   107565: MNT-13545 Fix compilation after merge of Javadoc


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

source/java/org/alfresco/service/cmr/site/SiteService.java

@@ -59,7 +59,7 @@ public interface SiteService
     	
     	/**
     	 * Return true to break out of the loop early.
-    	 * @return
+    	 * @return boolean
     	 */
     	public boolean isDone();
     }
@@ -225,8 +225,8 @@ public interface SiteService
     /**
      * Lists all the memberships in sites that the specified user is in.
      * 
-     * @param userName
-     * @param size
+     * @param userName String
+     * @param size int
      * @return a list of SiteMembership objects
      */
     @NotAuditable
@@ -324,7 +324,7 @@ public interface SiteService
      * @param nameFilter    name filter
      * @param roleFilter    role filter
      * @param size          max results size crop if >0
-     * @return Map<String, String>  the authority name and their role
+     * @return the authority name and their role
      */
     @NotAuditable
     Map<String, String> listMembers(String shortName, String nameFilter, String roleFilter, int size);
@@ -338,7 +338,7 @@ public interface SiteService
      * @param roleFilter        role filter
      * @param size          max results size crop if >0
      * @param collapseGroups    true if collapse member groups into user list, false otherwise
-     * @return Map<String, String>  the authority name and their role
+     * @return the authority name and their role
      */
     @NotAuditable
     Map<String, String> listMembers(String shortName, String nameFilter, String roleFilter, int size, boolean collapseGroups);
@@ -367,7 +367,7 @@ public interface SiteService
      * @param collapseGroups    true if collapse member groups into user list, false otherwise
      * @param pagingRequest     the paging request
      *
-     * @return Map<String, String>  the authority name and their role
+     * @return the authority name and their role
      */
     @NotAuditable
 	PagingResults<SiteMembership> listMembersPaged(String shortName, boolean collapseGroups, List<Pair<SiteService.SortFields, Boolean>> sortProps, PagingRequest pagingRequest);
@@ -513,8 +513,8 @@ public interface SiteService
      * node is moved or copied from one site to another. Permissions relating to the former site are
      * removed and the node is given the default permissions for its new site.
      * 
-     * @param relocatedNode
-     * @param containingSite
+     * @param relocatedNode NodeRef
+     * @param containingSite SiteInfo
      * @since 3.4.2
      */
     public void cleanSitePermissions(NodeRef relocatedNode, SiteInfo containingSite);