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

[maurizio.cimadamore at oracle.com]

Changeset: 50002e4d0cc9
Author:    langtools
Date:      2017-04-25 12:55 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/50002e4d0cc9

Automatic merge with default