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

[maurizio.cimadamore at oracle.com]

Changeset: 2f600d1c122d
Author:    langtools
Date:      2017-05-08 15:12 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/2f600d1c122d

Automatic merge with default