[rhq] Changes to 'bug/871873'