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

[maurizio.cimadamore at oracle.com]

Changeset: 25c27ad8d206
Author:    langtools
Date:      2017-05-05 16:00 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/25c27ad8d206

Automatic merge with default