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

[maurizio.cimadamore at oracle.com]

Changeset: d5873d14f308
Author:    langtools
Date:      2017-04-11 22:40 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/d5873d14f308

Automatic merge with default