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

[maurizio.cimadamore at oracle.com]

Changeset: 69d7844cdfeb
Author:    langtools
Date:      2017-04-04 11:39 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/69d7844cdfeb

Automatic merge with default