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