Merge "Remove redundant waiter in create_volume cleanup"