Clean code after vlan_vid match fix
Merge branch 'master' of https://github.com/YuvalAdler/ofsoftswitch13