CSPACE-5861: Updated test uispec datafiles to reflect addition of 'id' values to termInformation sections in six App layer config files for term information groups.
Merge pull request #74 from aronr/CSPACE-5861-Tests

CSPACE-5861: Updated test uispec datafiles to reflect addition of 'id' v...
CSPACE-5867 Added safety check in Vocab search to ensure that mis-match resources do not lead to inadvertent searches. This is a vulnerability with the Trie model, so closed it a hole here. Also added support to search for media related to vocab items, since it is not inconceivable that media would be related to a person, org, or concept, and this is simpler that fixing the UI at this point. Precludes the large searches that were happening as a result of these holes.
Merge branch 'master' into ucb-deploy

Conflicts:
	tomcat-main/src/test/resources/org/collectionspace/chain/csp/persistence/concept-authority.uispec
	tomcat-main/src/test/resources/org/collectionspace/chain/csp/persistence/location.uispec
	tomcat-main/src/test/resources/org/collectionspace/chain/csp/persistence/organization-authority.uispec
	tomcat-main/src/test/resources/org/collectionspace/chain/csp/persistence/person.uispec
	tomcat-main/src/test/resources/org/collectionspace/chain/csp/persistence/place.uispec
Merge branch 'ucb-deploy_3.2' into pahma_3.2