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

[maurizio.cimadamore at oracle.com]

Changeset: 4b7525c2cbcc
Author:    langtools
Date:      2017-05-04 19:21 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/4b7525c2cbcc

Automatic merge with default