hg: jdk9/sandbox/nashorn: Merge

[stuart.marks at oracle.com]

Changeset: 0f1d20b267c7
Author:    smarks
Date:      2016-06-10 16:38 -0700
URL:       http://hg.openjdk.java.net/jdk9/sandbox/nashorn/rev/0f1d20b267c7

Merge

- tools/fxshell/jdk/nashorn/tools/FXShell.java