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

[maurizio.cimadamore at oracle.com]

Changeset: 8147cfce48ed
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-06-09 22:25 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/8147cfce48ed

Automatic merge with condy