hg: amber/amber: Automatic merge with condy

[maurizio.cimadamore at oracle.com]

Changeset: 2a518e4a19bc
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-06-09 00:04 +0200
URL:       http://hg.openjdk.java.net/amber/amber/rev/2a518e4a19bc

Automatic merge with condy