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

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

ecl/regress/issue22809.ecl

@@ -0,0 +1,15 @@
+import Std;
+import lib_workunitservices;
+
+dWUIds := sort(STD.System.Workunit.workunitlist(lowwuid := 'W20190901-000000',
+                                                highwuid := 'W20190912-000000'), wuid);
+
+rTest := record
+    dataset(lib_workunitservices.WsStatistic) dStats;
+end;
+
+rTest xTest(dWUIds l) := transform
+    self.dStats := STD.System.Workunit.WorkunitStatistics(l.wuid,false,'nested[0],stype[graph],stat[TimeElapsed]');
+end;
+
+output(project(dWUIds,xTest(left)));

plugins/workunitservices/workunitservices.cpp

@@ -242,7 +242,7 @@ static IConstWorkUnit * getWorkunit(ICodeContext * ctx, const char * wuid)
     StringBuffer _wuid(wuid);
     if (!_wuid.length())
         return NULL;
-    wuid = _wuid.toUpperCase().str();
+    wuid = _wuid.toUpperCase().clip().str();
     Owned<IWorkUnitFactory> wuFactory = getWorkunitFactory(ctx);
     Owned<IConstWorkUnit> wu = wuFactory->openWorkUnit(wuid);
     if (wu)