hg: amber/amber: Automatic merge with default

[maurizio.cimadamore at oracle.com]

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

Automatic merge with default