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

[maurizio.cimadamore at oracle.com]

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

Automatic merge with default