hg: amber/amber: Automatic merge with default

[maurizio.cimadamore at oracle.com]

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

Automatic merge with default