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

[maurizio.cimadamore at oracle.com]

Changeset: f85f2a487951
Author:    langtools
Date:      2017-04-13 02:21 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/f85f2a487951

Automatic merge with default