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

[maurizio.cimadamore at oracle.com]

Changeset: ba3117cd74a7
Author:    langtools
Date:      2017-05-05 16:01 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/ba3117cd74a7

Automatic merge with default