Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)

51903 to 54309 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54310 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/opencmis/mapping/VersionSeriesIdProperty.java

@@ -41,7 +41,6 @@ public class VersionSeriesIdProperty extends AbstractProperty
     @Override
     public Serializable getValueInternal(CMISNodeInfo nodeInfo)
     {
-        return getGuid(nodeInfo.getCurrentNodeId());
-    	//return nodeInfo.getCurrentObjectId();
+    	return connector.constructObjectId(nodeInfo.getCurrentNodeId(), null);
     }
 }