Merge "Fix return type of UploadStashFile::remove()"