HPCC-8245 - Switch to TAKsmart

Plus a few minor changes after review

Signed-off-by: Jake Smith <jake.smith@lexisnexis.com>
wip