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

[maurizio.cimadamore at oracle.com]

Changeset: c98b44e2dc4f
Author:    langtools
Date:      2017-05-08 15:14 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/c98b44e2dc4f

Automatic merge with condy