hg: amber/amber: Automatic merge with condy

[maurizio.cimadamore at oracle.com]

Changeset: d3f5a548dd6a
Author:    mcimadamore
Date:      2017-09-25 18:10 +0200
URL:       http://hg.openjdk.java.net/amber/amber/rev/d3f5a548dd6a

Automatic merge with condy