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

[maurizio.cimadamore at oracle.com]

Changeset: 2dc974551c5c
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-06-15 13:01 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/2dc974551c5c

Automatic merge with condy