Merge branch 'candidate-6.2.18' into candidate-6.4.0

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