hg: amber/amber: Automatic merge with default

[maurizio.cimadamore at oracle.com]

Changeset: d6ecea9fd8dc
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-05-18 20:19 +0200
URL:       http://hg.openjdk.java.net/amber/amber/rev/d6ecea9fd8dc

Automatic merge with default