Merge pull request #69 from aronr/CSPACE-5767

CSPACE-5767: Render display name, not refName ...
Merge pull request #71 from aronr/CSPACE-5794

CSPACE-5794: Concept advanced search on Term Status field no longer errors.
adding work authority code; all tests pass
updating work authority config in advance of CSPACE-5684: Fix services-tenant-single config to resolve potential perm errors
removing local-settings.xml from repo
updating various work authority config files due to a change in the number of fields now used for advanced search
Merge tag 'v3.2.1' into procedure-work
Merge remote-tracking branch 'walkerart/procedure-work' into CSPACE-6118

Conflicts:
	cspi-services/src/test/java/org/collectionspace/chain/csp/persistence/services/TestService.java
	tomcat-main/src/main/resources/defaults/base-relations.xml
	tomcat-main/src/test/resources/org/collectionspace/chain/csp/persistence/namespaces.uischema
	tomcat-main/src/test/resources/org/collectionspace/chain/csp/persistence/recordlist.uischema
	tomcat-main/src/test/resources/org/collectionspace/chain/csp/persistence/recordtypes.uischema
CSPACE-6118: Additional cleanup of broader/narrower relations recordtype list in App layer config, lists of record types and vocabularies in App layer test datafiles, following initial merge.
CSPACE-6118: Added missing comma in App layer test datafile.
CSPACE-6118: Added missing commas in second App layer test datafile.
CSPACE-6118: Added Organization authority vocabulary to autocomplete for Creator, Publisher fields in Work record. Fixed typo in App layer config that prevented hierarchical relations from being created between Work records.
Merge pull request #86 from aronr/CSPACE-6118

CSPACE-6118: Integrate Work Authority contribution into the Application layer.