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

[maurizio.cimadamore at oracle.com]

Changeset: 6e3e68465b34
Author:    langtools
Date:      2017-05-02 13:15 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/6e3e68465b34

Automatic merge with default