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

[maurizio.cimadamore at oracle.com]

Changeset: 822ff7755ee4
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-05-18 20:16 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/822ff7755ee4

Automatic merge with default