hg: amber/amber: Automatic merge with condy

[maurizio.cimadamore at oracle.com]

Changeset: 6c2d60d3a3d1
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-06-16 11:44 +0200
URL:       http://hg.openjdk.java.net/amber/amber/rev/6c2d60d3a3d1

Automatic merge with condy