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

[maurizio.cimadamore at oracle.com]

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

Automatic merge with default