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