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

[maurizio.cimadamore at oracle.com]

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

Automatic merge with default