Fix pkt_match_16 for vlan masking
Merge branch 'master' of https://github.com/namssob/ofsoftswitch13