Merge branch 'candidate-6.2.6' into candidate-6.2.8

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