HPCC-12282 Move roxie query stats to use new mechanism

Minor changes following code review

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>