Merge pull request #99 from aronr/CSPACE-5980

CSPACE-5980: Adding Ray's contribution of a block in the <build> section...
CSPACE-6191,CSPACE-6180: Update Application build version to 4.1-SNAPSHOT, from 4.0-SNAPSHOT. Replace some hard-coded values for project version with variables.
Merge pull request #101 from aronr/CSPACE-6191

CSPACE-6191,CSPACE-6180: Update Application build version to 4.1-SNAPSHO...
Merge pull request #104 from aronr/CSPACE-6193

CSPACE-6193: Log output from XmlMerge operations to disk for debugging.
Merge pull request #106 from aronr/CSPACE-6199

CSPACE-6199: Allow sparse overriding of admin settings in settings.xml.
Merge pull request #108 from aronr/CSPACE-6204

CSPACE-6204,CSPACE-6207: Split off XmlMerge properties related to settings file. Add terms-used merge rule.
Merge pull request #110 from aronr/CSPACE-6206

CSPACE-6206: Replace the <instances> block outright in App layer authority ...
Merge pull request #112 from aronr/CSPACE-6213

CSPACE-6213: In Work authority, make the termSource field an autocomplete...
Merge pull request #114 from collectionspace/CSPACE-6216

CSPACE-6216: Fix lifesci person config to generate extension doctype.
Merge pull request #116 from aronr/CSPACE-6221

CSPACE-6221: Fix App layer check performed prior to sending password reset email.
CSPACE-6118: Correct trivial typo in work creator type vocabulary instance.
Merge pull request #118 from aronr/CSPACE-6226

CSPACE-6226: Inject correct doctype name for extended authority doctypes.
Merge pull request #121 from aronr/CSPACE-6227

CSPACE-6227: Insert correct 'extends=' parent doctype value in extended authority item doctypes.
CSPACE-6241: Emit blobCsid as a list results field when listing Media records, to prevent App layer fan-out.
CSPACE-6284: Set max services connections to 20, and warn when limit is reached.
CSPACE-6288: Use services-tenant-doctype instead of services-tenant-singular when searching for reports.
Merge pull request #123 from ray-lee/CSPACE-6288

CSPACE-6288: Use services-tenant-doctype instead of services-tenant-sing...
Merge pull request #122 from ray-lee/CSPACE-6284

CSPACE-6284: Set max services connections to 20, and warn when limit is ...
NOJIRA: Add top-level 'logs' directory to .gitignore file.
CSPACE-6175: Removed the nightly-settings.xml file from the App layer source tree, and the build targets related to that file from the Ant buildfile in the war-entry module.