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

[maurizio.cimadamore at oracle.com]

Changeset: f0f9febdbd42
Author:    langtools
Date:      2017-05-05 16:02 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/f0f9febdbd42

Automatic merge with default