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