[backfire] qos-scripts: merge r28622 and r28623