hg: jdk9/sandbox/nashorn: Merge

[michael.x.mcmahon at oracle.com]

Changeset: c55ca76f60f3
Author:    michaelm
Date:      2015-10-05 14:44 +0100
URL:       http://hg.openjdk.java.net/jdk9/sandbox/nashorn/rev/c55ca76f60f3

Merge

- test/src/jdk/nashorn/api/scripting/JSONCompatibleTest.java