[rhq] Branch 'bug/1016175' - modules/enterprise