Merge "Allow heat volume tests to use configured volume size"