[rhq] Branch 'rc/jon3.2.0.GA' - 2 commits - modules/enterprise