[rhq] Branch 'rhq-on-as7' - modules/enterprise