STAND-65: Placed System Properties Changes at appropriate instance

(cherry picked from commit 88f8e4f081b494edb91a75931c5ff6951487aab6)

Conflicts:
	src/main/java/org/openmrs/standalone/OpenmrsUtil.java