[rhq] Changes to 'bug/759615'