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

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

ecl/eclagent/eclagent.cpp

@@ -1121,7 +1121,7 @@ void EclAgent::setResultData(const char * stepname, unsigned sequence, int len,
 
 void EclAgent::doSetResultString(type_t type, const char *name, unsigned sequence, int len, const char *val)
 {
-    LOG(MCsetresult, unknownJob, "setResultString(%s,%d,'%.*s')", nullText(name), sequence, len, val);
+    LOG(MCsetresult, unknownJob, "setResultString(%s,%d,(%d bytes))", nullText(name), sequence, len);
     WorkunitUpdate w = updateWorkUnit();
     Owned<IWUResult> r = updateWorkUnitResult(w, name, sequence);
     if (r)

ecl/hqlcpp/hqlhtcpp.cpp

@@ -11005,7 +11005,7 @@ ABoundActivity * HqlCppTranslator::doBuildActivityOutput(BuildCtx & ctx, IHqlExp
             OwnedHqlExpr serializedRecord = getSerializedForm(dataset->queryRecord(), diskAtom);
             buildMetaMember(instance->classctx, serializedRecord, grouped && !ignoreGrouped, "queryDiskRecordSize");
         }
-        buildClusterHelper(instance->classctx, expr);
+        buildClusterHelper(instance->startctx, expr);
 
         //Both csv write and pipe with csv/xml format
         if (csvAttr)