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

[maurizio.cimadamore at oracle.com]

Changeset: 447ac1c8cf10
Author:    langtools
Date:      2017-05-11 01:48 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/447ac1c8cf10

Automatic merge with condy