Merge "Use native heat's WaitCondition in volume tests"