Split off 4.2.x branch

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