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

[maurizio.cimadamore at oracle.com]

Changeset: a61478f003c4
Author:    langtools
Date:      2017-05-10 08:35 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/a61478f003c4

Automatic merge with default