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

[maurizio.cimadamore at oracle.com]

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

Automatic merge with default