hg: valhalla/valhalla/nashorn: Merge

[david.simms at oracle.com]

Changeset: 4d8aed4114e8
Author:    dsimms
Date:      2017-08-24 09:44 +0200
URL:       http://hg.openjdk.java.net/valhalla/valhalla/nashorn/rev/4d8aed4114e8

Merge

- src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/EditPad.java