Support for vxlan 1.5 and trunk network. Also fix COI package issue with bad import