[rhq] Branch 'release-4.0.0' - 2 commits - modules/enterprise