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

[maurizio.cimadamore at oracle.com]

Changeset: 4e00bb46487a
Author:    langtools
Date:      2017-05-12 01:26 +0200
URL:       http://hg.openjdk.java.net/amber/amber/nashorn/rev/4e00bb46487a

Automatic merge with default