Update rhq-plugin.xml

Fix merge issue