Merge branch 'master' into candidate-4.2.0

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Merge remote-tracking branch 'origin/candidate-4.2.0' into closedown-4.2.x

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
HPCC-10251 Fix windows build break

Call MakeStringException instead.

Signed-off-by: Gavin Halliday <gavin.halliday@lexisnexis.com>
Merge pull request #5021 from ghalliday/issue10251

HPCC-10251 Fix windows build break

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Merge branch 'master' into candidate-4.2.0

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Merge remote-tracking branch 'origin/candidate-4.2.0' into closedown-4.2.x

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Merge remote-tracking branch 'origin/closedown-4.2.x'

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