Merge "Stop setting [ovs_vif_ovs] ovsdb_interface"