Split off closedown-4.0.x branch

Changes on master will now by default end up in 4.2

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