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

[maurizio.cimadamore at oracle.com]

Changeset: d0069c009d8f
Author:    langtools
Date:      2017-05-05 20:59 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/d0069c009d8f

Automatic merge with condy