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

[maurizio.cimadamore at oracle.com]

Changeset: 8c04a3243a08
Author:    langtools
Date:      2017-05-11 23:01 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/8c04a3243a08

Automatic merge with default