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

[maurizio.cimadamore at oracle.com]

Changeset: bcaca2d5b86c
Author:    langtools
Date:      2017-04-13 23:56 +0200
URL:       http://hg.openjdk.java.net/amber/amber/nashorn/rev/bcaca2d5b86c

Automatic merge with default