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

[maurizio.cimadamore at oracle.com]

Changeset: 8f2b624b1ef6
Author:    langtools
Date:      2017-04-26 12:16 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/8f2b624b1ef6

Automatic merge with default