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