master
8187443: Forest Consolidation: Move files to unified layout
8218280: LineNumberReader throws "Mark invalid" exception if CRLF straddles buffer
8235792: LineNumberReader.getLineNumber() behavior is inconsistent with respect to EOF