Revert VLAN bogosity (OVS just prints things differently, using the vlan_tci field)
Merge branch 'master' of https://github.com/frenetic-lang/ocaml-openflow