Merge origin/master

Conflicts:
	pom.xml
	src/main/java/gov/ic/geoint/geoserver/configuration/manager/ConfigurationCollector.java
	src/test/java/gov/ic/geoint/geoserver/configuration/manager/CollectAndDistributeTest.java