[rhq] Branch 'bug/rhq-1' - 3 commits - modules/enterprise