AMBARI-6389. Need a cleanup of global.xml properties no longer used by agent (aonishuk)