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

[maurizio.cimadamore at oracle.com]

Changeset: 2360c7284bba
Author:    langtools
Date:      2017-03-31 19:30 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/2360c7284bba

Automatic merge with default