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/repo/imap/ImapServiceImpl.java

@@ -570,7 +570,7 @@ public class ImapServiceImpl implements ImapService, OnRestoreNodePolicy, OnCrea
     
     /**
      * Workaround for MNT-12259
-     * @param nodeRef
+     * @param nodeRef NodeRef
      */
     @SuppressWarnings("deprecation")
     private void hideAndDelete(final NodeRef nodeRef)
@@ -1183,7 +1183,7 @@ public class ImapServiceImpl implements ImapService, OnRestoreNodePolicy, OnCrea
     /**
      * Recursively search the given root to get a list of folders
      * 
-     * @return
+     * @return List<AlfrescoImapFolder>
      */
     private List<AlfrescoImapFolder> expandFolder(
             NodeRef root,
@@ -1477,7 +1477,7 @@ public class ImapServiceImpl implements ImapService, OnRestoreNodePolicy, OnCrea
 
     /**
      * Checks for the existence of the flaggable aspect and adds it if it is not already present on the folder. 
-     * @param nodeRef
+     * @param nodeRef NodeRef
      */
     private void checkForFlaggableAspect(NodeRef nodeRef)
     {