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

[maurizio.cimadamore at oracle.com]

Changeset: 42c4c291d0dc
Author:    langtools
Date:      2017-03-25 03:35 +0100
URL:       http://hg.openjdk.java.net/amber/amber/nashorn/rev/42c4c291d0dc

Automatic merge with default