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

[maurizio.cimadamore at oracle.com]

Changeset: f1eb0dabbcfe
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-05-16 17:43 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/f1eb0dabbcfe

Automatic merge with default