Merge "Fix barematal deploy: dvr-vxlan"