Community Edition 4.2.6-rc12 Release Candidate 12

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

Conflicts:
	version.cmake

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Merge branch 'candidate-4.2.8' into closedown-4.2.x

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Community Edition 4.2.6-1 Gold

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Merge branch 'candidate-4.2.6' into closedown-4.2.x

Conflicts:
	version.cmake

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
HPCC-11933 Fix WsSMC.setActivityResponse to not update Activity cache

The Activity cache should not be updated in WsSMC.setActivityResponse().
This fix changes the code to not update the Activity cache in WsSMC.
setActivityResponse().

Signed-off-by: wangkx <kevin.wang@lexisnexis.com>
Merge pull request #6248 from richardkchapman/activity_cache_modified_4.2.6

HPCC-11933 Fix WsSMC.setActivityResponse to not update Activity cache

Reviewed-by: Gavin Halliday <ghalliday@hpccsystems.com>
Community Edition 4.2.6-2 Gold

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Merge branch 'candidate-4.2.6' into closedown-4.2.x

Conflicts:
	version.cmake

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Merge branch 'closedown-4.2.x' into candidate-4.2.8

Conflicts:
	version.cmake

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