[rhq] Branch 'bugfixes' - 3 commits - modules/enterprise