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

[maurizio.cimadamore at oracle.com]

Changeset: 42fb0f90a5fe
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-06-23 00:02 +0200
URL:       http://hg.openjdk.java.net/amber/amber/nashorn/rev/42fb0f90a5fe

Automatic merge with default