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

[maurizio.cimadamore at oracle.com]

Changeset: d4a7d6b18242
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-06-20 03:30 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/d4a7d6b18242

Automatic merge with condy