Merge branch 'vxlan-fdb-nexthop-misc-fixes'