[rhq] Changes to 'release-4.8.0'