[rhq] Changes to 'refs/tags/RHQ_4_7_0_JONCI'