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/test-java/org/alfresco/repo/dictionary/DictionaryRepositoryBootstrapTest.java

@@ -244,14 +244,14 @@ public class DictionaryRepositoryBootstrapTest extends BaseSpringTest
     /**
      * Create model node 
      * 
-     * @param uri
-     * @param prefix
-     * @param modelLocalName
-     * @param importStatement
-     * @param description
-     * @param typeName
-     * @param propertyName
-     * @return
+     * @param uri String
+     * @param prefix String
+     * @param modelLocalName String
+     * @param importStatement String
+     * @param description String
+     * @param typeName String
+     * @param propertyName String
+     * @return NodeRef
      */
     private NodeRef createModelNode(
             String uri, 
@@ -291,14 +291,14 @@ public class DictionaryRepositoryBootstrapTest extends BaseSpringTest
      * 
      * Gets the model string 
      * 
-     * @param uri
-     * @param prefix
-     * @param modelLocalName
-     * @param importStatement
-     * @param description
-     * @param typeName
-     * @param propertyName
-     * @return
+     * @param uri String
+     * @param prefix String
+     * @param modelLocalName String
+     * @param importStatement String
+     * @param description String
+     * @param typeName String
+     * @param propertyName String
+     * @return String
      */
     private String getModelString(
             String uri,