Merge "waiters: Add wait_for_volume_attachment_remove"