hg: jdk9/sandbox/nashorn: Merge

[aleksey.shipilev at oracle.com]

Changeset: 509f66858581
Author:    shade
Date:      2015-12-14 14:12 +0300
URL:       http://hg.openjdk.java.net/jdk9/sandbox/nashorn/rev/509f66858581

Merge

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