hg: amber/amber: Automatic merge with condy

[maurizio.cimadamore at oracle.com]

Changeset: 297129af25ac
Author:    mcimadamore
Date:      2017-10-25 01:34 +0200
URL:       http://hg.openjdk.java.net/amber/amber/rev/297129af25ac

Automatic merge with condy