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

[maurizio.cimadamore at oracle.com]

Changeset: b28ec1ce05eb
Author:    langtools
Date:      2017-04-11 19:05 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/b28ec1ce05eb

Automatic merge with default