hg: jdk9/sandbox/nashorn: Merge

[erik.joelsson at oracle.com]

Changeset: ba80478ea8f1
Author:    erikj
Date:      2015-12-03 17:40 +0100
URL:       http://hg.openjdk.java.net/jdk9/sandbox/nashorn/rev/ba80478ea8f1

Merge

- src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/version.properties-template