[rhq] Branch 'release_jon3.x' - modules/enterprise