Merge "Add more detailed upload stash error messages"