Merge "Remove netvirt references from ovsdb"