[rhq] Branch 'resource-upgrade' - 21 commits - .classpath modules/core modules/enterprise