Merge "Conform the RefStack testcase with the Rally context"