hg: amber/amber/jdk: Automatic merge with condy

[maurizio.cimadamore at oracle.com]

Changeset: 15fb47fa0b6c
Author:    langtools
Date:      2017-05-11 01:43 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/15fb47fa0b6c

Automatic merge with condy