hg: amber/amber: Automatic merge with condy

[maurizio.cimadamore at oracle.com]

Changeset: d688e6e96dcb
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-06-23 00:03 +0200
URL:       http://hg.openjdk.java.net/amber/amber/rev/d688e6e96dcb

Automatic merge with condy