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

[maurizio.cimadamore at oracle.com]

Changeset: 664311f50fdd
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-05-16 17:42 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/664311f50fdd

Automatic merge with default