hg: amber/amber: Automatic merge with default

[maurizio.cimadamore at oracle.com]

Changeset: 6a23a5f4d47a
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-05-17 01:06 +0200
URL:       http://hg.openjdk.java.net/amber/amber/rev/6a23a5f4d47a

Automatic merge with default