Merge "Fix image format set for rally test cases"