Merge "Fixed the problem with the Vlan PCP not being passed on to the switch. Also...