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

126560 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      124327 jvonka: RA-834, RA-678: Optionally request generation of a rendition on content creation (eg. file upload)
      - add/fix missing test file


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

source/test-java/org/alfresco/rest/api/tests/RenditionsTest.java

@@ -488,10 +488,10 @@ public class RenditionsTest extends AbstractBaseApiTest
 
         // Create multipart request - Word doc file
         renditionName = "doclib";
-        fileName = "CAP-v1.2-os.doc";
+        fileName = "quick.docx";
         file = getResourceFile(fileName);
         reqBody = MultiPartBuilder.create()
-                .setFileData(new FileData(fileName, file, MimetypeMap.MIMETYPE_WORD))
+                .setFileData(new FileData(fileName, file, MimetypeMap.MIMETYPE_OPENXML_WORDPROCESSING))
                 .setRenditions(Collections.singletonList(renditionName))
                 .build();