Merge pull request #4190 from HollyGurza/6795
T6795: QoS: Fix duplicate entries in class match filters