Merge "filerepo: Remove begin/done comments from LocalFile"