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

[maurizio.cimadamore at oracle.com]

Changeset: 1f4073544ffd
Author:    langtools
Date:      2017-05-10 08:39 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/1f4073544ffd

Automatic merge with condy