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

[maurizio.cimadamore at oracle.com]

Changeset: b9e430e614a7
Author:    langtools
Date:      2017-04-22 02:55 +0200
URL:       http://hg.openjdk.java.net/amber/amber/nashorn/rev/b9e430e614a7

Automatic merge with default