Merge branch 'v2.7'

diff --cc services/common/src/main/java/org/collectionspace/services/common/relation/RelationJAXBSchema.java
index 713c546d27f1a086be58071f5f95a10c0d26f197,2237211d097ed7e5dbd222cb10f7bd4fddad7b51..3d4d01fa3f81a1000de5fb619c4ec552dadf6ab2
--- 1/services/common/src/main/java/org/collectionspace/services/common/relation/RelationJAXBSchema.java
--- 2/services/common/src/main/java/org/collectionspace/services/common/relation/RelationJAXBSchema.java
+++ b/services/common/src/main/java/org/collectionspace/services/common/relation/RelationJAXBSchema.java
@@@ -44,12 -46,10 +46,12 @@@ public interface RelationJAXBSchema 
        \r
        /** The Constant RELATIONSHIP_TYPE_DISPLAYNAME. */\r
        final static String RELATIONSHIP_TYPE_DISPLAYNAME = "predicateDisplayName";\r
 +        \r
 +        final static String RELATIONSHIP_META_TYPE = "relationshipMetaType";\r
  \r
      final static String SUBJECT_URI =         "subjectUri";\r
-     final static String SUBJECT_CSID =                "subjectCsid";\r
-     final static String SUBJECT_REFNAME =     "subjectRefName";\r
+     final static String SUBJECT_CSID =                IRelationsManager.SUBJECT;\r
+     final static String SUBJECT_REFNAME =     IRelationsManager.SUBJECT_REFNAME;\r
      final static String SUBJECT_DOCTYPE =     "subjectDocumentType";\r
  \r
      final static String OBJECT_URI =          "objectUri";\r

diff --cc services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RemoteDocumentModelHandlerImpl.java
Simple merge