Merge "DSCP remarking and VLAN Tag Remarking"