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

[maurizio.cimadamore at oracle.com]

Changeset: e39b46001ddd
Author:    langtools
Date:      2017-05-11 23:03 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/e39b46001ddd

Automatic merge with condy