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

[maurizio.cimadamore at oracle.com]

Changeset: 8c04ac7c1f3b
Author:    langtools
Date:      2017-04-21 20:46 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/8c04ac7c1f3b

Automatic merge with default