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/transfer/AbstractManifestProcessorBase.java

@@ -156,9 +156,9 @@ public abstract class AbstractManifestProcessorBase implements TransferManifestP
     /**
      * Given the node ref, this method constructs the appropriate ChildAssociationRef that would place this node in the
      * transfer's temporary folder. Useful when handling orphans.
-     * 
-     * @param nodeRef
-     * @return
+     *
+     * @param nodeRef NodeRef
+     * @return ChildAssociationRef
      */
     protected ChildAssociationRef getTemporaryLocation(NodeRef nodeRef)
     {
@@ -248,8 +248,8 @@ public abstract class AbstractManifestProcessorBase implements TransferManifestP
      * This method is invoked if an exception or error occurs while processing the manifest.
      * By default it does nothing, but classes that extend this class can override this to provide
      * custom clean-up. 
-     * @param node
-     * @param ex
+     * @param node TransferManifestNode
+     * @param ex Throwable
      */
     protected void localHandleException(TransferManifestNode node, Throwable ex)
     {