[rhq] Changes to 'stefan/release_BZ758753'