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

[maurizio.cimadamore at oracle.com]

Changeset: f7638e0b1133
Author:    langtools
Date:      2017-05-10 19:42 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/f7638e0b1133

Automatic merge with default