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

[maurizio.cimadamore at oracle.com]

Changeset: 31872d0f2f89
Author:    langtools
Date:      2017-04-26 11:36 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/31872d0f2f89

Automatic merge with default