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

[maurizio.cimadamore at oracle.com]

Changeset: 9f8c6e53e971
Author:    langtools
Date:      2017-05-10 19:41 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/9f8c6e53e971

Automatic merge with default