Merge branch 'candidate-7.10.2' into candidate-7.10.x

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