hg: amber/amber: Automatic merge with default

[maurizio.cimadamore at oracle.com]

Changeset: c14156df2abc
Author:    langtools
Date:      2017-05-05 20:55 +0200
URL:       http://hg.openjdk.java.net/amber/amber/rev/c14156df2abc

Automatic merge with default