Merge "Wait for complete deletion of volume snapshot before deleting volume"