hg: amber/amber: Automatic merge with default

[maurizio.cimadamore at oracle.com]

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

Automatic merge with default