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

[maurizio.cimadamore at oracle.com]

Changeset: db84a709e535
Author:    langtools
Date:      2017-04-20 18:52 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/db84a709e535

Automatic merge with default