Split off candidate_4.0.4 branch

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