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

[maurizio.cimadamore at oracle.com]

Changeset: d81b86ab27c5
Author:    langtools
Date:      2017-05-02 13:17 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/d81b86ab27c5

Automatic merge with default