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

[maurizio.cimadamore at oracle.com]

Changeset: 1199f9b3d2d2
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-05-26 00:02 +0200
URL:       http://hg.openjdk.java.net/amber/amber/nashorn/rev/1199f9b3d2d2

Automatic merge with default