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

[maurizio.cimadamore at oracle.com]

Changeset: b68d1bb3c7b8
Author:    langtools
Date:      2017-05-04 16:41 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/b68d1bb3c7b8

Automatic merge with condy