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