Community Edition 4.0.4-rc1 Release Candidate 1

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Merge branch 'closedown-4.0.x' into candidate-4.0.4

Conflicts:
	version.cmake

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Community Edition 4.0.4-1 Gold

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

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