HPCC-21261 Read @thorname as cluster name for running WUs on thor

The existing WsSMC.Activity code uses the /Status/Server[@name=
"ThorMaster"]/@cluster as the cluster name for a running thor WUs.
This is incorrect when a Thor cluster has multiple Thor processes.

Signed-off-by: wangkx <kevin.wang@lexisnexis.com>

esp/services/ws_smc/ws_smcService.cpp

@@ -439,7 +439,9 @@ void CActivityInfo::readRunningWUsOnStatusServer(IEspContext& context, IProperty
         IPropertyTree& serverStatusNode = itrStatusServer->query();
 
         StringBuffer serverInstance;
-        if ((statusServerType == WsSMCSSTThorLCRCluster) || (statusServerType == WsSMCSSTRoxieCluster))
+        if (statusServerType == WsSMCSSTThorLCRCluster)
+            serverStatusNode.getProp("@thorname", serverInstance);
+        else if (statusServerType == WsSMCSSTRoxieCluster)
             serverStatusNode.getProp("@cluster", serverInstance);
         else
             serverInstance.appendf("%s on %s", serverName, serverStatusNode.queryProp("@node"));