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

126470 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      122329 jkaabimofrad: Fixed API tests failure.


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

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

@@ -38,7 +38,6 @@ import org.junit.runners.Suite;
 @RunWith(Suite.class)
 @Suite.SuiteClasses({
     NodeApiTest.class,
-    RenditionsTest.class,
     TestSites.class,
     TestNodeComments.class,
     TestCMIS.class,
@@ -57,7 +56,8 @@ import org.junit.runners.Suite;
     TestRemovePermissions.class,
     TestPublicApi128.class,
     TestPublicApiCaching.class,
-    ModulePackagesApiTest.class
+    ModulePackagesApiTest.class,
+    RenditionsTest.class
 })
 public class ApiTest
 {