Merged HEAD (5.2) to 5.2.N (5.2.1)

126616 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      125219 jkaabimofrad: Fixed minor formatting issue in the toString methods. Also, removed unused imports.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126961 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/rest/api/model/Rendition.java

@@ -70,7 +70,7 @@ public class Rendition
     public String toString()
     {
         final StringBuilder sb = new StringBuilder(150);
-        sb.append("Rendition [id='").append(id)
+        sb.append("Rendition [id=").append(id)
                     .append(", status=").append(status)
                     .append(", contentInfo=").append(contentInfo)
                     .append(']');