HPCC-12422 Fix compile errors caused by rebase

Signed-off-by: Gavin Halliday <gavin.halliday@lexisnexis.com>