Merge "BUG 5746 - Ovsdb QoS and Queue model enhancements"