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

[maurizio.cimadamore at oracle.com]

Changeset: 7f315cefdd82
Author:    langtools
Date:      2017-05-05 16:01 +0200
URL:       http://hg.openjdk.java.net/amber/amber/nashorn/rev/7f315cefdd82

Automatic merge with default