[rhq] Branch 'resource-upgrade' - modules/core