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