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

[maurizio.cimadamore at oracle.com]

Changeset: e5a35d8fa316
Author:    langtools
Date:      2017-05-13 00:15 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/e5a35d8fa316

Automatic merge with default