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

[maurizio.cimadamore at oracle.com]

Changeset: 7aaf0b0ed33b
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-07-19 20:51 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/7aaf0b0ed33b

Automatic merge with condy