Split off candidate-4.0.x branch

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