hg: amber/amber: Automatic merge with default

[maurizio.cimadamore at oracle.com]

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

Automatic merge with default