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

[maurizio.cimadamore at oracle.com]

Changeset: 626ec33960ba
Author:    langtools
Date:      2017-04-27 08:21 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/626ec33960ba

Automatic merge with default