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