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

[maurizio.cimadamore at oracle.com]

Changeset: 6df21c2523ea
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-07-21 00:01 +0200
URL:       http://hg.openjdk.java.net/amber/amber/nashorn/rev/6df21c2523ea

Automatic merge with default