Merge "Add waiter to test_volume_backup_delete"