126561 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
124331 jvonka: RA-834, RA-678: Optionally request generation of a rendition on content creation (eg. file upload)
- one more attempt (works locally, but for some reason is failing on build machines)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126907 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261