hg: amber/amber: Automatic merge with default

[maurizio.cimadamore at oracle.com]

Changeset: ff17be6d78f5
Author:    langtools
Date:      2017-05-12 01:27 +0200
URL:       http://hg.openjdk.java.net/amber/amber/rev/ff17be6d78f5

Automatic merge with default