hg: amber/amber: Automatic merge with default

[maurizio.cimadamore at oracle.com]

Changeset: 80be429fc4f4
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-06-09 00:00 +0200
URL:       http://hg.openjdk.java.net/amber/amber/rev/80be429fc4f4

Automatic merge with default