Merge branch 'candidate-4.2.8' into closedown-5.0.x

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