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

126605 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      124992 gjames: RA-847, RA-848: Showing orignal parent path but not parentid


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

source/java/org/alfresco/rest/api/impl/DeletedNodesImpl.java

@@ -94,6 +94,9 @@ public class DeletedNodesImpl implements DeletedNodes
         Map<QName, Serializable> nodeProps = nodeService.getProperties(aNode.getNodeRef());
         aNode.setArchivedAt((Date)nodeProps.get(ContentModel.PROP_ARCHIVED_DATE));
         aNode.setArchivedByUser(aNode.lookupUserInfo((String)nodeProps.get(ContentModel.PROP_ARCHIVED_BY), mapUserInfo, personService));
+
+        //Don't show parent id
+        aNode.setParentId(null);
     }
 
     @Override