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

126553 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      124207 jvonka: RA-893: Fix "Multi-part update content appears to work but doesn't" - throw 415


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

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

@@ -2558,6 +2558,10 @@ public class NodeApiTest extends AbstractBaseApiTest
         // Download the file
         response = getSingle(url, user1, null, 200);
         assertNotNull(content, response.getResponse());
+
+        // -ve - try to  update content using multi-part form data
+        payload = new BinaryPayload(txtFile, "multipart/form-data", null);
+        putBinary(url, user1, payload, null, null, 415);
     }
 
     /**