[rhq] Branch 'resource-upgrade' - 3 commits - modules/plugins