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

[maurizio.cimadamore at oracle.com]

Changeset: 75b6427e5c5a
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-07-21 00:02 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/75b6427e5c5a

Automatic merge with default