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

[maurizio.cimadamore at oracle.com]

Changeset: 3e39230e790e
Author:    langtools
Date:      2017-05-05 20:55 +0200
URL:       http://hg.openjdk.java.net/amber/amber/nashorn/rev/3e39230e790e

Automatic merge with default