Merge "Add method to match address \ port with QosFilter"