[rhq] Branch 'code-smell' - modules/enterprise