hg: amber/amber/langtools: Automatic merge with default

[maurizio.cimadamore at oracle.com]

Changeset: cc39a5924037
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-08-18 00:02 +0200
URL:       http://hg.openjdk.java.net/amber/amber/langtools/rev/cc39a5924037

Automatic merge with default

! src/jdk.jshell/share/classes/jdk/jshell/Eval.java
- test/jdk/jshell/MergedTabShiftTabCommandTest.java
- test/jdk/jshell/MergedTabShiftTabExpressionTest.java