hg: jdk9/sandbox/nashorn: Merge

[erik.joelsson at oracle.com]

Changeset: a8d69491528d
Author:    erikj
Date:      2016-04-06 17:55 +0200
URL:       http://hg.openjdk.java.net/jdk9/sandbox/nashorn/rev/a8d69491528d

Merge

! make/BuildNashorn.gmk
- src/jdk.scripting.nashorn/share/classes/META-INF/MANIFEST.MF
- src/jdk.scripting.nashorn/share/classes/META-INF/services/javax.script.ScriptEngineFactory