Merge branch 'master' into 13936-inactive-user-text

diff --cc src/common/config.ts
index 40ba801266bb8e484e903cf4c2c0b768ecc1c0ab,758a77ba91ed688c5c81ea2dd8d2be3dd6dff23e..e5f7b1c6d70e2a163c6dd29a11e393d9c6c04b28
--- 1/src/common/config.ts
--- 2/src/common/config.ts
+++ b/src/common/config.ts
@@@ -45,9 -45,10 +45,12 @@@ export interface ClusterConfigJSON 
          VocabularyURL: string;
          FileViewersConfigURL: string;
          WelcomePageHTML: string;
 +        InactivePageHTML: string;
 +        SiteName: string;
      };
+     Login: {
+         LoginCluster: string;
+     };
  }
  
  export class Config {
@@@ -145,9 -148,10 +150,12 @@@ export const mockClusterConfigJSON = (c
          VocabularyURL: "",
          FileViewersConfigURL: "",
          WelcomePageHTML: "",
 +        InactivePageHTML: "",
 +        SiteName: "",
      },
+     Login: {
+         LoginCluster: "",
+     },
      ...config
  });