Merge changes I89d6fe9a,I10b19a01

* changes:
  DscpPolicyTest - add ip version asserts
  dscpPolicy.c - old/new_first_u32 is actually be32