HPCC-11452 Ensure control:queries does not split lines

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Merge pull request #5903 from richardkchapman/control-queries-format

HPCC-11452 Ensure control:queries does not split lines

Reviewed-by: Gavin Halliday <ghalliday@hpccsystems.com>
Merge branch 'closedown-5.0.x' into candidate-5.0.0

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
HPCC-11459 Fix OSX build break

Signed-off-by: Jake Smith <jake.smith@lexisnexis.com>
Merge pull request #5911 from jakesmith/hpcc-11459b

HPCC-11459 Fix OSX build break

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
HPCC-11477 Activities are being reset excessively

An activity with two outputs (typically a splitter) can be reset on one arm,
then (because of the stopSink issue where resets occur without stops), can be
stopped then reset on the other. The stop() causes the state no longer to be
reset, so the reset of the upstream activity tree is repeated.

When splitters are inputs to other splitters this can result in an exponential
explosion of calls to reset.

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Merge pull request #5916 from richardkchapman/excessive-reset

HPCC-11477 Activities are being reset excessively

Reviewed-By: Jake Smith <jake.smith@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Community Edition 4.2.6-rc2 Release Candidate 2

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 'closedown-4.2.x' into candidate-5.0.0

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

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