Merge branch 'candidate-4.2.6' into closedown-4.2.x

Conflicts:
	version.cmake

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Community Edition 4.2.8-rc1 Release Candidate 1

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
HPCC-11901 CSV auto discovery generates wrong field names if
recordstructurepresent=false

Fix record structure generation.

Signed-off-by: Attila Vamos <attila.vamos@gmail.com>
Merge pull request #6232 from AttilaVamos/HPCC-11901-fix

HPCC-11901 CSV auto discovery generates wrong field names if recordstructurepresent=false

Reviewed-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>
Community Edition 4.2.8-rc2 Release Candidate 2

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
HPCC-11932 Roxie attach causing Roxie cluster to load empty package

The onReconnect calls are supposed to reload from new information in dali, but
becuase of the isConnected being set AFTER the onReconnects, and the iniCache
happening before, the onReconnect was liable to reload from the empty cache
information.

The cache should not be cleared on reconnects (only needed on the initial
connect, and that can be handled more cleanly by calling loadCache in
writeCache). The isConnected needs to be set earlier - it was moved recently,
I believe just because it seemed like a good idea... Added a comment to
explain why it needs to be where it is.

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Merge pull request #6254 from richardkchapman/roxie-losing-state

HPCC-11932 Roxie attach causing Roxie cluster to load empty package

Reviewed-by: Gavin Halliday <ghalliday@hpccsystems.com>
Merge branch 'candidate-4.2.8' into closedown-5.0.x

Conflicts:
	dali/ft/daftformat.cpp
	version.cmake

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