Merge "Get rid of IConsoleReader without re-breaking Eclipse"