hg: amber/amber: Automatic merge with default

[maurizio.cimadamore at oracle.com]

Changeset: 8699a1e5b90b
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-06-16 11:35 +0200
URL:       http://hg.openjdk.java.net/amber/amber/rev/8699a1e5b90b

Automatic merge with default