Merge "Fixes test_volume_backup_delete failing during tearDown."