CSPACE-5980: Adding Ray's contribution of a block in the <build> section of the tomcat-main POM to exclude App layer config files from being included in the App layer's WAR file. This means those files now will be read exclusively from Tomcat's lib directory.
Merge pull request #100 from aronr/CSPACE-5980

CSPACE-5980: Adding Ray's contribution of a block in the <build> section...
CSPACE-6193: Set log level for AssemblingContentHandler class to INFO, in order to write output from XmlMerge operations to disk for debugging. Whitespace reformatting and minor cleanup in that class.
Merge pull request #105 from aronr/CSPACE-6193

CSPACE-6193: Set log level for AssemblingContentHandler class to INFO, i...
Merge branch 'v4.0' into ucb-deploy_4.0

Conflicts:
	tomcat-main/pom.xml