Merge changes Iaaa76b99,I8a9dc310

* changes:
  Fix ConsoleTest#testRun; expect scheduler to shutdown when input fails
  Flush streams before quitting in singleCommand mode