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

[maurizio.cimadamore at oracle.com]

Changeset: 5f1a1aa12ec5
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-08-18 00:01 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/5f1a1aa12ec5

Automatic merge with default