Vlan fix

Splits rules that pop_vlan and don't match on VLAN into two rules: one that matches on vlan_any and pops, and one that matches on vlan_none and doesn't pop. Uses VLAN_VID = -1 to encode "vlan_any" to 0x04 backend.