Cleaned up some config values I missed
Merge branch 'master' into 5294

Conflicts:
	etc/cmd_standby.ini.sample