hg: amber/amber/nashorn: Automatic merge with default

[maurizio.cimadamore at oracle.com]

Changeset: 4857133865a6
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-08-11 12:50 +0200
URL:       http://hg.openjdk.java.net/amber/amber/nashorn/rev/4857133865a6

Automatic merge with default

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