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

[maurizio.cimadamore at oracle.com]

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

Automatic merge with default