HPCC-10206 Include changes from the review

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