[rhq] Branch 'alertPlus' - 2 commits - modules/enterprise