Merge changes I8b3eb0e1,I1d2bfd52

* changes:
  DscpPolicy: remove post-T API dependency from test
  DscpPolicy: remove v6 default route as it is added by the RA