[rhq] Changes to 'release-3.0.0-patch1'