[rhq] Branch 'feature/performance' - modules/enterprise