Merge "Use common "waiters.wait_for_snapshot_status" function everywhere"