hg: amber/amber: Automatic merge with condy

[maurizio.cimadamore at oracle.com]

Changeset: 50fd0fe8fde2
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-06-02 00:46 +0200
URL:       http://hg.openjdk.java.net/amber/amber/rev/50fd0fe8fde2

Automatic merge with condy