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

[maurizio.cimadamore at oracle.com]

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

Automatic merge with default