Adding Vxlan trunk integration bug fixes