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

[maurizio.cimadamore at oracle.com]

Changeset: 97ac5d8b643e
Author:    langtools
Date:      2017-05-02 13:16 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/97ac5d8b643e

Automatic merge with default