hg: jdk9/sandbox/langtools: Merging recent jdk9/dev changes to the jlahoda-jshell-fixes-branch

[jan.lahoda at oracle.com]

Changeset: 72c2c0c2176b
Author:    jlahoda
Date:      2016-01-21 15:53 +0100
URL:       http://hg.openjdk.java.net/jdk9/sandbox/langtools/rev/72c2c0c2176b

Merging recent jdk9/dev changes to the jlahoda-jshell-fixes-branch

! src/jdk.jshell/share/classes/jdk/internal/jshell/tool/ConsoleIOContext.java