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

[maurizio.cimadamore at oracle.com]

Changeset: f25ab4c74cb7
Author:    langtools
Date:      2017-05-12 17:32 +0200
URL:       http://hg.openjdk.java.net/amber/amber/langtools/rev/f25ab4c74cb7

Automatic merge with default