Merge remote-tracking branch 'origin/v4.2' into v5.0

# Conflicts:
#	package-lock.json
#	package.json

Author: ml054

src/ServerWide/index.ts

@@ -35,7 +35,7 @@ export interface DatabaseRecord {
     encrypted?: boolean;
     etagForBackup?: number;
     deletionInProgress?: { [key: string]: DeletionInProgressStatus };
-    databaseStatus?: DatabaseStateStatus;
+    databaseState?: DatabaseStateStatus;
     topology?: DatabaseTopology;
     conflictSolverConfig?: ConflictSolver;
     documentsCompression?: DocumentsCompressionConfiguration;

test/Ported/Subscriptions/SecuredSubscriptionsBasicTest.ts

@@ -11,7 +11,7 @@ describe("SecuredSubscriptionsBasicTest", function () {
 
     this.retries(3);
 
-    const _reasonableWaitTime = 5 * 1000;
+    const _reasonableWaitTime = 15 * 1000;
     this.timeout(5 * _reasonableWaitTime);
 
     let store: IDocumentStore;

test/ServerWide/GetDatabaseRecordTest.ts

@@ -25,6 +25,7 @@ describe("GetDatabaseRecordTest", function () {
             new GetDatabaseRecordOperation(store.database));
 
         assert.ok(databaseRecord);
+        assert.strictEqual(databaseRecord.databaseState, "Normal");
         assert.strictEqual(databaseRecord.databaseName, store.database);
     });