HPCC-9936 Change after code review

Not all changed, still need to reshuffle the 'activities' group per Gavin's
comment.

Signed-off-by: jamienoss <james.noss@lexisnexis.com>