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

[maurizio.cimadamore at oracle.com]

Changeset: 8d9265e8639d
Author:    langtools
Date:      2017-05-05 20:57 +0200
URL:       http://hg.openjdk.java.net/amber/amber/nashorn/rev/8d9265e8639d

Automatic merge with default