hg: jdk9/sandbox/nashorn: Merge

[stuart.marks at oracle.com]

Changeset: 34e963cec216
Author:    smarks
Date:      2016-03-24 15:29 -0700
URL:       http://hg.openjdk.java.net/jdk9/sandbox/nashorn/rev/34e963cec216

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