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

[maurizio.cimadamore at oracle.com]

Changeset: 39be8f1ba5b8
Author:    langtools
Date:      2017-05-03 18:10 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/39be8f1ba5b8

Automatic merge with default