[rhq] 18 commits - modules/core modules/enterprise