hg: jdk9/sandbox/nashorn: Merge

[michael.x.mcmahon at oracle.com]

Changeset: 28826b055093
Author:    michaelm
Date:      2016-04-04 15:53 +0100
URL:       http://hg.openjdk.java.net/jdk9/sandbox/nashorn/rev/28826b055093

Merge

- src/jdk.dynalink/share/classes/jdk/dynalink/beans/messages.properties
- src/jdk.scripting.nashorn/share/classes/META-INF/MANIFEST.MF
- src/jdk.scripting.nashorn/share/classes/META-INF/services/javax.script.ScriptEngineFactory