[rhq] Branch 'as7plugin' - 5 commits - modules/core modules/enterprise