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

[maurizio.cimadamore at oracle.com]

Changeset: 62def6dbf30b
Author:    langtools
Date:      2017-04-11 19:06 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/62def6dbf30b

Automatic merge with default