Merge branch 'CSPACE-5678' into CSPACE-5678-A

diff --cc services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/schemas/collectionobjects_common.xsd
Simple merge

diff --cc services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/NuxeoConnectorEmbedded.java
index 694ab3f937fa73816322de214efbc9d00de5adc1,4d3e266db2b99d52d92d6547997e9b862a98f223..f8f462342dff75253f4bbb5bd15b5c4cdf5ed633
--- 1/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/NuxeoConnectorEmbedded.java
--- 2/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/NuxeoConnectorEmbedded.java
+++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/NuxeoConnectorEmbedded.java
@@@ -6,14 -5,11 +6,15 @@@ import java.util.Collection
  import java.util.Hashtable;\r
  import java.util.Iterator;\r
  \r
 +import javax.naming.InitialContext;\r
 +import javax.naming.NamingException;\r
  import javax.servlet.ServletContext;\r
  \r
+ import org.collectionspace.services.common.api.JEEServerDeployment;\r
  import org.collectionspace.services.config.RepositoryClientConfigType;\r
 +import org.collectionspace.services.config.tenant.RepositoryDomainType;\r
  import org.collectionspace.services.nuxeo.util.NuxeoUtils;\r
 +import org.nuxeo.ecm.core.NXCore;\r
  import org.nuxeo.ecm.core.api.DocumentModel;\r
  import org.nuxeo.ecm.core.api.DocumentModelList;\r
  import org.nuxeo.ecm.core.api.repository.RepositoryInstance;\r