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

[maurizio.cimadamore at oracle.com]

Changeset: d074b4c983cb
Author:    langtools
Date:      2017-04-13 23:56 +0200
URL:       http://hg.openjdk.java.net/amber/amber/nashorn/rev/d074b4c983cb

Automatic merge with default