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

[maurizio.cimadamore at oracle.com]

Changeset: b300bd7b7f07
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-08-16 02:45 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/b300bd7b7f07

Automatic merge with condy