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

[maurizio.cimadamore at oracle.com]

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

Automatic merge with default