Merge pull request #105 from aronr/CSPACE-6193

CSPACE-6193: Set log level for AssemblingContentHandler class to INFO, i...
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 #106 from aronr/CSPACE-6199

CSPACE-6199: Allow sparse overriding of admin settings in settings.xml.