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

[maurizio.cimadamore at oracle.com]

Changeset: d526b88aa4d1
Author:    langtools
Date:      2017-05-03 18:10 +0200
URL:       http://hg.openjdk.java.net/amber/amber/nashorn/rev/d526b88aa4d1

Automatic merge with default