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

[maurizio.cimadamore at oracle.com]

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

Automatic merge with condy