[rhq] Branch 'release/jon3.1.x' - 7 commits - modules/plugins