hg: amber/amber: Automatic merge with default

[maurizio.cimadamore at oracle.com]

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

Automatic merge with default