Merge changes from topic "dscp-tap"

* changes:
  DscpPolicyTest: fix linter errors
  DscpPolicyTest: use tap instead of tun
  TestNetworkService: fix test network interface bringup