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

[maurizio.cimadamore at oracle.com]

Changeset: 471ccc5191c1
Author:    langtools
Date:      2017-05-12 01:27 +0200
URL:       http://hg.openjdk.java.net/amber/amber/nashorn/rev/471ccc5191c1

Automatic merge with default