hg: amber/amber: Automatic merge with condy

[maurizio.cimadamore at oracle.com]

Changeset: 9305c327eef9
Author:    mcimadamore
Date:      2017-11-09 23:09 +0100
URL:       http://hg.openjdk.java.net/amber/amber/rev/9305c327eef9

Automatic merge with condy