Merge "Configure os-vif ovsdb_connection"