Merge remote-tracking branch 'origin/candidate-4.0.2' into closedown-4.0.x

Conflicts:
	version.cmake

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