Adjusted some configs for Site24x7.
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md
	build/resources/main/scorekeeper/util/sample.system-props.conf
	src/main/groovy/scorekeeper/HeadScorekeepingActor.groovy
	src/main/groovy/scorekeeper/MetricsEnvironmentSetupMessage.java