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

[maurizio.cimadamore at oracle.com]

Changeset: 1ccfc1e1e20e
Author:    langtools
Date:      2017-05-11 23:02 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/1ccfc1e1e20e

Automatic merge with default