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

[maurizio.cimadamore at oracle.com]

Changeset: fc3689644a1d
Author:    langtools
Date:      2017-04-27 08:22 +0200
URL:       http://hg.openjdk.java.net/amber/amber/nashorn/rev/fc3689644a1d

Automatic merge with default