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

[maurizio.cimadamore at oracle.com]

Changeset: 4ca4c9b9d7dd
Author:    langtools
Date:      2017-05-03 18:11 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/4ca4c9b9d7dd

Automatic merge with default