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

[maurizio.cimadamore at oracle.com]

Changeset: 1e7dfbe0faa4
Author:    langtools
Date:      2017-05-13 00:17 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/1e7dfbe0faa4

Automatic merge with default