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

[maurizio.cimadamore at oracle.com]

Changeset: a8ae9d1c8a92
Author:    langtools
Date:      2017-05-12 07:03 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/a8ae9d1c8a92

Automatic merge with condy