Merge "Revert "Fix cleanup for volume backup tests""