Merge "UploadBase: Formally deprecate old methods for stashing files"