Merge "Add ability to configure VLAN tag on patch port"