hg: amber/amber: Automatic merge with default

[maurizio.cimadamore at oracle.com]

Changeset: eb44934310e4
Author:    mcimadamore
Date:      2017-10-03 13:19 +0200
URL:       http://hg.openjdk.java.net/amber/amber/rev/eb44934310e4

Automatic merge with default