Merge remote-tracking branch 'remotes/origin/develop' into temp-jeff

Conflicts:
	pom.xml
	site/pom.xml
	site/src/main/resources/runtime-properties/integrationdev.properties
	site/src/main/webapp/WEB-INF/log4j.xml