Merge "Bug 1212: Values of VLAN match fields were wrong."