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