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

[maurizio.cimadamore at oracle.com]

Changeset: 3d115d20d9d9
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-05-18 22:10 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/3d115d20d9d9

Automatic merge with default