Fix cherry-pick merge issues

fdbclient/MultiVersionTransaction.actor.cpp

@@ -989,19 +989,10 @@ void MultiVersionDatabase::DatabaseState::updateDatabase(Reference<IDatabase> ne
 		}
 
 		db = newDb;
-
 		optionLock.leave();
-
-		if (dbProtocolVersion.get().hasStableInterfaces() && db) {
-			versionMonitorDb = db;
-		} else {
-			// For older clients that don't have an API to get the protocol version, we have to monitor it locally
-			versionMonitorDb = MultiVersionApi::api->getLocalClient()->api->createDatabase(clusterFilePath.c_str());
-		}
 	} else {
 		// We don't have a database connection, so use the local client to monitor the protocol version
 		db = Reference<IDatabase>();
-		versionMonitorDb = MultiVersionApi::api->getLocalClient()->api->createDatabase(clusterFilePath.c_str());
 	}
 
 	dbVar->set(db);

fdbclient/ThreadSafeTransaction.h

@@ -46,11 +46,6 @@ class ThreadSafeDatabase : public IDatabase, public ThreadSafeReferenceCounted<T
 	// cluster file therefore is valid, but the database might be unavailable.
 	ThreadFuture<Void> onConnected();
 
-	// Returns the protocol version reported by the coordinator this client is connected to
-	// If an expected version is given, the future won't return until the protocol version is different than expected
-	ThreadFuture<ProtocolVersion> getServerProtocol(
-	    Optional<ProtocolVersion> expectedVersion = Optional<ProtocolVersion>()) override;
-
 	void addref() { ThreadSafeReferenceCounted<ThreadSafeDatabase>::addref(); }
 	void delref() { ThreadSafeReferenceCounted<ThreadSafeDatabase>::delref(); }