[rhq] Changes to 'bug/927868'