hg: amber/amber: Automatic merge with condy

[maurizio.cimadamore at oracle.com]

Changeset: ba2741bc2c12
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-05-17 01:07 +0200
URL:       http://hg.openjdk.java.net/amber/amber/rev/ba2741bc2c12

Automatic merge with condy