HPCC-10682 Add namespace to avoid two classes with same name clashing

Signed-off-by: Gavin Halliday <gavin.halliday@lexisnexis.com>
Merge pull request #5287 from ghalliday/issue10682

HPCC-10682 Add namespace to avoid two classes with same name clashing

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
HPCC-10671 Ensure activities hash table is cleared when query load fails

Signed-off-by: Gavin Halliday <gavin.halliday@lexisnexis.com>
Merge pull request #5291 from ghalliday/issue10671

HPCC-10671 Ensure activities hash table is cleared when query load fails

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Community Edition 4.2.2-rc8 Release Candidate 8

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Merge remote-tracking branch 'origin/candidate-4.2.2' into closedown-4.2.x

Conflicts:
	version.cmake

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Merge remote-tracking branch 'origin/closedown-4.2.x'

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