Merge remote-tracking branch 'origin/candidate-3.10.4' into candidate-3.10.x

Conflicts:
	version.cmake

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