HPCC-12422 Fix compile errors caused by rebase

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

HPCC-12422 Fix compile errors caused by rebase

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Merge remote-tracking branch 'origin/candidate-5.0.4'

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