Merge branch 'candidate-7.2.x' into candidate-7.4.x

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>

esp/src/eclwatch/ActivityWidget.js

@@ -83,7 +83,7 @@ define([
             //  Hitched actions  ---
             _onRefresh: function (event) {
                 this.inherited(arguments);
-                this.refreshUsage(true);
+                this.refreshUsage(false);
             },
 
             _onPause: function (event, params) {

esp/src/src/DiskUsage.ts

@@ -11,7 +11,7 @@ Palette.rainbow("DiskUsage", ["green", "green", "green", "green", "green", "gree
 
 export class Summary extends FlexGrid {
 
-    private _connection = new MachineService({ baseUrl: "" });
+    private _connection = new MachineService({ baseUrl: "", timeoutSecs: 360 });
     private _loadingMsg;
     private _usage: { [id: string]: { details: GetTargetClusterUsageEx.TargetClusterUsage, gauge: Gauge } } = {};