[rhq] Branch 'resource-upgrade' - 14 commits - modules/core modules/enterprise