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

[maurizio.cimadamore at oracle.com]

Changeset: e962196057fd
Author:    langtools
Date:      2017-05-04 19:23 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/e962196057fd

Automatic merge with condy