Merge branch 'candidate-6.4.x' into candidate-7.0.x

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