Merge "Catch and deal with UploadStashZeroLengthFileException when removing stashed...