hg: amber/amber: Automatic merge with condy

[maurizio.cimadamore at oracle.com]

Changeset: b2d8e3d35aa1
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-05-18 20:23 +0200
URL:       http://hg.openjdk.java.net/amber/amber/rev/b2d8e3d35aa1

Automatic merge with condy