Merge "Remove pointless override of doStashFile in UploadFromStash"