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/rating/RatingNamingConventionsUtil.java

@@ -44,7 +44,7 @@ import org.alfresco.service.namespace.RegexQNamePattern;
  * the rollup name as defined in the algorithm class e.g. {@link RatingCountRollupAlgorithm#ROLLUP_NAME}.
  * <p/>
  * Since Alfresco 4.1.5, the "cm:" prefix is no longer required and any namespace can be used. These are provided
- * via injection with {@link RatingSchemeImpl#setModelPrefix(String))}
+ * via injection with {@link RatingSchemeImpl#setModelPrefix(String)}
  * 
  * @author Neil McErlean
  * @since 3.5
@@ -79,7 +79,7 @@ public class RatingNamingConventionsUtil
      * 
      * @param username the username to match against or <code>null</code> for all usernames.
      * @param ratingSchemeName the ratingSchemeName to match against or <code>null</code> for all ratingSchemes.
-     * @return
+     * @return QNamePattern
      */
     public QNamePattern getRatingAssocPatternForUser(String username, String ratingSchemeName)
     {