Merge "Handle ovs_use_veth option"