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

[maurizio.cimadamore at oracle.com]

Changeset: 0b4308b6b136
Author:    langtools
Date:      2017-04-18 18:30 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/0b4308b6b136

Automatic merge with default