Merge "Fix compute create volume test race condition"