fork of rhq 4.9.0