Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)

125333 rneamtu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      125215 bhorje: ACE-5308 set valid parent association qname 


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

source/test-java/org/alfresco/repo/virtual/bundle/VirtualNodeServiceExtensionTest.java

@@ -1032,6 +1032,9 @@ public class VirtualNodeServiceExtensionTest extends VirtualizationIntegrationTe
         NodeRef parentRef = primaryParent.getParentRef();
         assertEquals(virtualFolder1NodeRef,
                      parentRef);
+        assertEquals(QName
+                    .createQNameWithValidLocalName(VirtualContentModel.VIRTUAL_CONTENT_MODEL_1_0_URI,
+                                                   "Node2"),primaryParent.getQName());
 
         // check that the primary parent node of level 2 virtual folder is his
         // virtual folder parent