[rhq] Changes to 'origin/release-3.0.0.B02'