hg: jdk9/sandbox/jdk: Merge

[marcus.larsson at oracle.com]

Changeset: 6710214e0ad6
Author:    mlarsson
Date:      2015-05-28 13:22 +0200
URL:       http://hg.openjdk.java.net/jdk9/sandbox/jdk/rev/6710214e0ad6

Merge

- make/gendata/Gendata-jdk.dev.gmk
- test/sun/nio/cs/Test4200310.sh