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

[maurizio.cimadamore at oracle.com]

Changeset: 07d3d812631f
Author:    langtools
Date:      2017-04-21 20:45 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/07d3d812631f

Automatic merge with default