hg: amber/amber: Automatic merge with condy

[maurizio.cimadamore at oracle.com]

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

Automatic merge with condy