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

[maurizio.cimadamore at oracle.com]

Changeset: 02d5bf628616
Author:    langtools
Date:      2017-05-08 15:11 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/02d5bf628616

Automatic merge with default