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

[maurizio.cimadamore at oracle.com]

Changeset: 87b41d2b9010
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-07-21 00:03 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/87b41d2b9010

Automatic merge with condy