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

[maurizio.cimadamore at oracle.com]

Changeset: 808f61f1ca13
Author:    langtools
Date:      2017-05-11 00:23 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/808f61f1ca13

Automatic merge with condy