Merge "Fix cleanup for volume backup tests"