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

[maurizio.cimadamore at oracle.com]

Changeset: bc308ed12019
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-05-18 23:56 +0200
URL:       http://hg.openjdk.java.net/amber/amber/langtools/rev/bc308ed12019

Automatic merge with default