HPCC-12282 Move roxie query stats to use new mechanism

Tidy up, removing intermediate class that is not wanted any more.

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