Merge branch 'master' into candidate-4.2.0

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Merge remote-tracking branch 'origin/candidate-4.2.0' into closedown-4.2.x

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Merge branch 'master' into candidate-4.2.0

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Merge remote-tracking branch 'origin/candidate-4.2.0' into closedown-4.2.x

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Merge remote-tracking branch 'origin/closedown-4.2.x'

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