Merge branch 'multiLogs' into candidate-4.2.0

Fixed compiler error (extra classname:: in hpp file) as I merged

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