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

[maurizio.cimadamore at oracle.com]

Changeset: 18d876037462
Author:    langtools
Date:      2017-05-02 11:24 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/18d876037462

Automatic merge with default