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

[maurizio.cimadamore at oracle.com]

Changeset: a2b0a4635898
Author:    langtools
Date:      2017-04-25 12:56 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/a2b0a4635898

Automatic merge with default