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

[maurizio.cimadamore at oracle.com]

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

Automatic merge with default

- test/jdk/jshell/MergedTabShiftTabCommandTest.java
- test/jdk/jshell/MergedTabShiftTabExpressionTest.java