[rhq] Branch 'jsanda/aggregation' - modules/enterprise