Both forceDatabaseRefresh and onDbVersionMismatch take the DBLock, but currently take in the db name as a string. Change both methods to take the db name in as a DatabaseName object so the DBLock can be taken on the correct tenant's db.