hg: amber/amber: Automatic merge with default

[maurizio.cimadamore at oracle.com]

Changeset: e75e1a626ff0
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-07-14 00:00 +0200
URL:       http://hg.openjdk.java.net/amber/amber/rev/e75e1a626ff0

Automatic merge with default