hg: amber/amber: Automatic merge with default

[maurizio.cimadamore at oracle.com]

Changeset: f8381cc5159d
Author:    mcimadamore
Date:      2017-10-02 18:40 +0200
URL:       http://hg.openjdk.java.net/amber/amber/rev/f8381cc5159d

Automatic merge with default