HPCC-11422 changes from Code review.

Signed-off-by: rpastrana <rodrigo.pastrana@lexisnexis.com>