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

[maurizio.cimadamore at oracle.com]

Changeset: 4a6c3d7de0d5
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-08-17 23:59 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/4a6c3d7de0d5

Automatic merge with default