Merge "use BufferedInputStream in readTextFile" into jb-mr1-dev