Ensure a qos flow for a port overrides a flow for a network match

Change-Id: I1ec0e79af4333d919e28790c7c1765bfc3bbe3ab