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

[maurizio.cimadamore at oracle.com]

Changeset: 640bdc4aa24a
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-06-02 00:42 +0200
URL:       http://hg.openjdk.java.net/amber/amber/nashorn/rev/640bdc4aa24a

Automatic merge with default