Updated the patch file used in the Installlation modules manual test suite to coincide with the current default system-model.cfg.xml in order to prevent warnings during the patch process.
Merge pull request #1205 from rackerlabs/TestSysCfgPatch

Updated the patch file used in the Installation modules manual test suite
Updated the Log4J 2.x configs to include the date (%d) in the output and increased the scope of the org.apache.commons.httpclient logger to org.apache.
Removed the extra space that was left in the due to the fiasco with the "Thread Context Stack/Nested Diagnostic Context" Conversion Pattern (%x).
Cleaned up the DecommissionHttpLoggingTest to not look for the spaces.
Cleaned up the Slf4jHttpLoggingTest to not look for the spaces.
Cleaned up the ReposeValveTest to not look for the spaces.
Merge pull request #1208 from rackerlabs/Log4J2xConfigUpdate

Updated the Log4J 2.x configs.
Merge branch 'master' into REP-1158_core_spring

Conflicts:
	repose-aggregator/core/valve/src/test/resources/log4j2-test.xml
	repose-aggregator/functional-tests/spock-functional-test/src/test/groovy/features/filters/decomissionedfilter/DecommissionHttpLoggingTest.groovy
	repose-aggregator/functional-tests/spock-functional-test/src/test/groovy/framework/ReposeValveTest.groovy
Fixing a failing test, shame on me
Wrap some of the shutdown stuff to deal with "not yet started"