[rhq] Branch 'bugfixes' - modules/enterprise