Merge branch 'geneve-vxlan-deps'