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

[maurizio.cimadamore at oracle.com]

Changeset: d66a235798e0
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-09-16 01:10 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/d66a235798e0

Automatic merge with condy