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

[maurizio.cimadamore at oracle.com]

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

Automatic merge with condy

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