[rhq] Branch 'release/jon3.2.x' - modules/enterprise