hg: jdk9/sandbox/nashorn: Merge

[roger.riggs at oracle.com]

Changeset: 0926845167e4
Author:    rriggs
Date:      2015-03-24 16:40 -0400
URL:       http://hg.openjdk.java.net/jdk9/sandbox/nashorn/rev/0926845167e4

Merge

- src/jdk.scripting.nashorn/share/classes/jdk/nashorn/tools/resources/shell.js