[rhq] Changes to 'origin/release-3.0.1'