[rhq] Branch 'refs/tags/RHQ_4_2_0_JON_3_0_1_GA' - 3 commits - modules/enterprise