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

[maurizio.cimadamore at oracle.com]

Changeset: 589cd256941a
Author:    langtools
Date:      2017-05-13 00:16 +0200
URL:       http://hg.openjdk.java.net/amber/amber/langtools/rev/589cd256941a

Automatic merge with default