Merge remote-tracking branch 'cspace-lyrasis/master' into dts-4.5-merge-1

author remillet <remillet@yahoo.com>

Thu, 9 Feb 2017 23:35:18 +0000 (15:35 -0800)

committer remillet <remillet@yahoo.com>

Thu, 9 Feb 2017 23:35:18 +0000 (15:35 -0800)
author remillet <remillet@yahoo.com>
Thu, 9 Feb 2017 23:35:18 +0000 (15:35 -0800)
committer remillet <remillet@yahoo.com>
Thu, 9 Feb 2017 23:35:18 +0000 (15:35 -0800)
diff --cc services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/nuxeo/AuthorityItemDocumentModelHandler.java
Simple merge
diff --cc services/common/src/main/java/org/collectionspace/services/common/context/AbstractServiceContextImpl.java
Simple merge
author	remillet <remillet@yahoo.com>
	Thu, 9 Feb 2017 23:35:18 +0000 (15:35 -0800)
committer	remillet <remillet@yahoo.com>
	Thu, 9 Feb 2017 23:35:18 +0000 (15:35 -0800)
		1	2
services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/nuxeo/AuthorityItemDocumentModelHandler.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/common/src/main/java/org/collectionspace/services/common/context/AbstractServiceContextImpl.java	patch \|	diff1 \|	diff2 \|	blob \| history