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

[maurizio.cimadamore at oracle.com]

Changeset: f22873c750ce
Author:    langtools
Date:      2017-04-06 18:26 +0200
URL:       http://hg.openjdk.java.net/amber/amber/nashorn/rev/f22873c750ce

Automatic merge with default