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

[maurizio.cimadamore at oracle.com]

Changeset: e186d49c1ba1
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-08-30 23:55 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/e186d49c1ba1

Automatic merge with condy