hg: jdk9/sandbox/jdk: Merge

[magnus.ihse.bursie at oracle.com]

Changeset: 7e3c4f4d059e
Author:    ihse
Date:      2015-06-05 10:16 +0200
URL:       http://hg.openjdk.java.net/jdk9/sandbox/jdk/rev/7e3c4f4d059e

Merge

- make/gendata/Gendata-jdk.dev.gmk
! make/lib/CoreLibraries.gmk
- src/bsd/doc/man/ja/native2ascii.1
- src/bsd/doc/man/native2ascii.1
- src/java.base/share/classes/com/sun/java/util/jar/pack/package.html
- src/java.base/share/classes/com/sun/net/ssl/package.html
- src/java.base/share/classes/java/io/package.html
- src/java.base/share/classes/java/lang/ref/package.html
- src/java.base/share/classes/java/nio/channels/spi/package.html
- src/java.base/share/classes/java/nio/charset/package.html
- src/java.base/share/classes/java/nio/charset/spi/package.html
- src/java.base/share/classes/java/nio/package.html
- src/java.base/share/classes/java/text/package.html
- src/java.base/share/classes/java/text/spi/package.html
- src/java.base/share/classes/java/util/jar/package.html
- src/java.base/share/classes/java/util/package.html
- src/java.base/share/classes/java/util/regex/package.html
- src/java.base/share/classes/java/util/spi/package.html
- src/java.base/share/classes/javax/crypto/interfaces/package.html
- src/java.base/share/classes/javax/crypto/package.html
- src/java.base/share/classes/javax/crypto/spec/package.html
- src/java.base/share/classes/javax/net/package.html
- src/java.base/share/classes/javax/net/ssl/package.html
- src/java.base/share/classes/sun/reflect/package.html
! src/java.base/share/native/launcher/defines.h
! src/java.base/share/native/launcher/main.c
! src/java.base/share/native/libjava/System.c
! src/java.base/share/native/libjava/jdk_util.c
- src/jdk.dev/share/classes/sun/tools/native2ascii/A2NFilter.java
- src/jdk.dev/share/classes/sun/tools/native2ascii/Main.java
- src/jdk.dev/share/classes/sun/tools/native2ascii/N2AFilter.java
- src/jdk.dev/share/classes/sun/tools/native2ascii/resources/MsgNative2ascii.java
! test/sun/misc/Version/Version.java
- test/sun/nio/cs/Test4200310.sh
- test/sun/tools/jhat/hprof.bin
- test/sun/tools/jhat/jmap.bin
- test/sun/tools/jhat/minimal.bin
- test/sun/tools/native2ascii/A2N_4630463
- test/sun/tools/native2ascii/A2N_4630463.expected
- test/sun/tools/native2ascii/A2N_4630971
- test/sun/tools/native2ascii/A2N_4701617
- test/sun/tools/native2ascii/A2N_4701617.expected
- test/sun/tools/native2ascii/A2N_6247817
- test/sun/tools/native2ascii/N2A_4636448
- test/sun/tools/native2ascii/N2A_4636448.expected
- test/sun/tools/native2ascii/Native2AsciiTests.sh
- test/sun/tools/native2ascii/NativeErrors.java
- test/sun/tools/native2ascii/Permission.java
- test/sun/tools/native2ascii/resources/ImmutableResourceTest.java
- test/sun/tools/native2ascii/test1
- test/sun/tools/native2ascii/test3