Merge "Fix UploadStash::removeFile() error"