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

[maurizio.cimadamore at oracle.com]

Changeset: cba9f06b0266
Author:    langtools
Date:      2017-04-10 23:16 +0200
URL:       http://hg.openjdk.java.net/amber/amber/langtools/rev/cba9f06b0266

Automatic merge with default