[rhq-project/rhq] c271a7: fix upgrade test failures