Merge branch 'closedown-4.2.x' into candidate-4.2.10

Conflicts:
	version.cmake

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

esp/services/ws_smc/ws_smcService.cpp

@@ -672,6 +672,7 @@ ActivityInfo* CWsSMCEx::createActivityInfo(IEspContext &context)
     Owned<ActivityInfo> activityInfo = new ActivityInfo();
     readTargetClusterInfo(context, clusters, serverStatusRoot, activityInfo);
     readRunningWUsAndQueuedWUs(context, envRoot, serverStatusRoot, dfuRecoveryRoot, activityInfo);
+    activityInfo->timeCached.setNow();
     return activityInfo.getClear();
 }
 

esp/services/ws_smc/ws_smcService.hpp

@@ -93,7 +93,7 @@ struct ActivityInfo : public CInterface, implements IInterface
 {
     IMPLEMENT_IINTERFACE;
 
-    ActivityInfo() { timeCached.setNow(); };
+    ActivityInfo() {};
     bool isCachedActivityInfoValid(unsigned timeOutSeconds);
 
     CDateTime timeCached;