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

[maurizio.cimadamore at oracle.com]

Changeset: c2ab6f6664f1
Author:    langtools
Date:      2017-05-11 01:41 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/c2ab6f6664f1

Automatic merge with default