Split off candidate-4.2.10

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
HPCC-12085 Avoid malloc/free when updating the buffer callbacks

Signed-off-by: Gavin Halliday <gavin.halliday@lexisnexis.com>
HPCC-12079 Start Activity Cache timeout from cache creation completion

The WsSMC.Activity method checks the cache timeout to decide
whether it can use the Activity information cache or not. The
existing code starts the cache timeout at the beginning of
creating the cache. If the cache creation takes a longer time
than the timeout value, the second Activity request may have
to re-build the cache as soon as the first Activity request
finishes the cache creation. This fix sets the starting time
of the timeout at the end of the cache creation.

Signed-off-by: wangkx <kevin.wang@lexisnexis.com>
Merge pull request #6345 from ghalliday/issue12085

HPCC-12085 Avoid malloc/free when updating the buffer callbacks

Reviewed-By: Jake Smith <jake.smith@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Merge pull request #6346 from wangkx/activity_cache_time_out_start

HPCC-12079 Start Activity Cache timeout from cache creation completion

Reviewed-By: Gavin Halliday <gavin.halliday@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Merge branch 'closedown-4.2.x' into candidate-4.2.10

Conflicts:
	version.cmake

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

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

Conflicts:
	roxie/roxiemem/roxiemem.cpp

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