hg: amber/amber: Automatic merge with default

[maurizio.cimadamore at oracle.com]

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

Automatic merge with default