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

[maurizio.cimadamore at oracle.com]

Changeset: 0af151a84a6f
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-06-17 18:26 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/0af151a84a6f

Automatic merge with condy