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

[maurizio.cimadamore at oracle.com]

Changeset: 4af2ef2750e0
Author:    langtools
Date:      2017-05-05 16:03 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/4af2ef2750e0

Automatic merge with condy