CSPACE-6199: Allow selective (sparse) overriding of settings in the <admin> block of settings.xml with counterpart settings in a local settings file.
Merge pull request #107 from aronr/CSPACE-6199

CSPACE-6199: Allow sparse overriding of admin settings in settings.xml.
CSPACE-6204,CSPACE-6207: Integrated Ray's contribution of a separate XmlMerge properties file for the per-tenant settings.xml file, splitting this off from the general XmlMerge properties file. Added a terms-used block to the latter properties file, also a UCB contribution. Added explanatory comments to each of the two properties files.
CSPACE-6024: Clarified comment describing use of XPaths in XmlMerge.
CSPACE-6024: Additional clarification of comments.
Merge pull request #109 from aronr/CSPACE-6204

CSPACE-6204,CSPACE-6207: Split off XmlMerge properties related to settings file. Add terms-used merge rule.
CSPACE-6206,CSPACE-6205: Replace the <instances> block outright in App layer authority config files. Minor reordering of demonstration vocabulary instances to uniformly place local instances first.
CSPACE-6206,CSPACE-6205: Whitespace fixes.
CSPACE-6206,CSPACE-6205: Update App layer test datafile to reflect reordering of vocabularies.
Merge pull request #111 from aronr/CSPACE-6206

CSPACE-6206: Replace the <instances> block outright in App layer authority ...
Merge branch 'v4.0' into ucb-deploy_4.0

Conflicts:
	tomcat-main/src/main/resources/defaults/xmlmerge-settings.properties
	tomcat-main/src/main/resources/defaults/xmlmerge.properties
	tomcat-main/src/main/resources/tenants/lifesci/lifesci-authority-concept.xml
	tomcat-main/src/main/resources/tenants/lifesci/lifesci-authority-location.xml
	tomcat-main/src/main/resources/tenants/lifesci/lifesci-authority-person.xml
	tomcat-main/src/main/resources/tenants/lifesci/lifesci-authority-place.xml
	tomcat-main/src/main/resources/tenants/lifesci/lifesci-authority-work.xml
BAMPFA-19: Add is-extension='true' to lifesci-authority-person.xml.
BAMPFA-19,BAMPFA-21: Remove type='authority' from termList configs, since this breaks term completion on termSource.