[rhq] Changes to 'bug/783603'