[rhq] Changes to 'bug/966777'