hg: amber/amber: Automatic merge with condy

[maurizio.cimadamore at oracle.com]

Changeset: dfee47c3a39a
Author:    langtools
Date:      2017-05-05 20:59 +0200
URL:       http://hg.openjdk.java.net/amber/amber/rev/dfee47c3a39a

Automatic merge with condy