Merge "Change line breaks in LocalFile::recordUpload2()"