CSPACE-5181, CSPACE-5188 Fixing tests to 1) not use test authorities it cannot clean up, and 2) properly init authorities before running tests.
Merge branch 'CSPACE-5181'
CSPACE-5181 Changed some annotations so setup for tests happens once per class, and not once per test.
Merge branch 'CSPACE-5181'
NOJIRA - Removed some debug logging config that was causing spew into the app logs and console.
Merge branch 'CSPACE-5181' into v2.4
NOJIRA - Turned down test debug spew.
CSPACE-5175: Redo selected vocabulary names to conform to issue description, give sensible display names, remove test vocabularies whose need was obviated by CSPACE-5181.
Merge remote-tracking branch 'upstream/master' into cspace-5175-rework

Conflicts:
	tomcat-main/src/main/resources/defaults/base-authority-concept.xml
	tomcat-main/src/main/resources/defaults/base-authority-location.xml
	tomcat-main/src/main/resources/defaults/base-authority-place.xml
	tomcat-main/src/main/resources/defaults/base-authority-taxon.xml
CSPACE-5198: Change app layer's XMLMerge logging output from DEBUG level to INFO level and change to overwrite existing logging files
CSPACE-5198: Change app layer's XMLMerge logging output from DEBUG level to INFO level and change to overwrite existing logging files
CSPACE-5175,CSPACE-5181: Update app layer test datafiles and lifesci authority configs to remove recently-removed vocaularies, including former 'test-only' vocabularies and vocabularies removed during CSPACE-5175 rework.
CSPACE-5175: Additional updates to app layer test datafiles to reflect all configured vocabs (e.g. common_ta, taxon).
Merge remote-tracking branch 'upstream/master' into cspace-5175-rework
Merge pull request #29 from aronr/cspace-5175-rework

CSPACE-5175: Rework vocabulary instance changes to match those described by Carly on this JIRA issue; remove new 'Local' vocabularies and instead simply change the display names of existing 'default' vocabularies. Remove person and organization 'test' vocabularies, per CSPACE-5181.
Merge pull request #30 from aronr/cspace-5175-rework

CSPACE-5175: Rework vocabulary instance changes to match those described by Carly on this JIRA issue; remove new 'Local' vocabularies and instead simply change the display names of existing 'default' vocabularies. Remove person and organization 'test' vocabularies, per CSPACE-5181.
Merge branch 'v2.4' into ucb-deploy_2.4
PAHMA-225: Added value to NAGPRA Applicability value list for Cataloging record
CSPACE-5207: Making Patrick's suggested config change to filter soft deleted records (in 'deleted' workflow state) from 'All record types' search results. This prevents a user from seeing and attempting to edit deleted records, which would result in their seeing blank records, without an error message being displayed.
Merge pull request #31 from aronr/cspace-5207

CSPACE-5207: Making Patrick's suggested config change to filter soft deleted records (in 'deleted' workflow state) from 'All record types' search results. This prevents a user from seeing and attempting to edit deleted records, which would in turn result in their seeing blank records, without an error message being displayed.