[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.
(cherry picked from commit 4d27730aee50a12910e754157ce6e6d13556693a)

Signed-off-by: John Mazzitelli <mazz@redhat.com>
[BZ 1070262] Snip superfluous "public" access modifier.
(cherry picked from commit 3ff036a33887fdc3cfa4463f2e1179d183e0c5e2)

Signed-off-by: John Mazzitelli <mazz@redhat.com>