hg: amber/amber: Automatic merge with default

[maurizio.cimadamore at oracle.com]

Changeset: 2f34c21c9b9b
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-08-11 12:42 +0200
URL:       http://hg.openjdk.java.net/amber/amber/rev/2f34c21c9b9b

Automatic merge with default