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>
HPCC-10664 - Hold locks to subfiles, release super

Ensure that any activity that lookups a file, holds the locks to
the subfiles and releases the lock to the super. This allows
other jobs/components to manipulate the super, once the job has
established which files it needs.

Signed-off-by: Jake Smith <jake.smith@lexisnexis.com>