hg: amber/amber: Automatic merge with default

[maurizio.cimadamore at oracle.com]

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

Automatic merge with default