hg: amber/amber: Automatic merge with condy

[maurizio.cimadamore at oracle.com]

Changeset: 92b588a9dc74
Author:    langtools
Date:      2017-05-12 21:23 +0200
URL:       http://hg.openjdk.java.net/amber/amber/rev/92b588a9dc74

Automatic merge with condy