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