HPCC-10257 Fix regression suite issues

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

HPCC-10257 Fix regression suite issues

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>