[rhq] Branch 'bugfixes' - 4 commits - modules/core modules/enterprise