hg: jdk9/sandbox/nashorn: Merge

[aleksey.shipilev at oracle.com]

Changeset: 2adaf825625e
Author:    shade
Date:      2015-10-08 18:58 +0300
URL:       http://hg.openjdk.java.net/jdk9/sandbox/nashorn/rev/2adaf825625e

Merge

- test/script/currently-failing/gettersetter.js
- test/script/currently-failing/property_delete.js
- test/src/jdk/nashorn/api/scripting/JSONCompatibleTest.java