hg: amber/amber: Automatic merge with condy

[maurizio.cimadamore at oracle.com]

Changeset: 19ea7caa9624
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-08-11 12:52 +0200
URL:       http://hg.openjdk.java.net/amber/amber/rev/19ea7caa9624

Automatic merge with condy