[BZ 1070262] Updates to the configuration upgrade code for the server and the agent.

This commit resolves the upgrade obfuscation for rhq-server.properties file and some minor tweaks for the agent-configuration.xml file.