[rhq] Changes to 'release_jon3.0.x'