hg: amber/amber/jdk: Automatic merge with default

[maurizio.cimadamore at oracle.com]

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

Automatic merge with default