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

[maurizio.cimadamore at oracle.com]

Changeset: af9934da586f
Author:    langtools
Date:      2017-05-11 00:22 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/af9934da586f

Automatic merge with default