Merge "Always setup libvirt for tap devices when using Neutron"