Merge branch 'closedown-4.2.x' into closedown-5.0.x

Conflicts:
	version.cmake

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