Update rhq-plugin.xml

Fix bad merge