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

[maurizio.cimadamore at oracle.com]

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

Automatic merge with default