[rhq] Branch 'perftest' - 2 commits - modules/core modules/enterprise modules/helpers