hg: jdk9/sandbox/jdk: Merge

[marcus.larsson at oracle.com]

Changeset: ae3fbf73bc45
Author:    mlarsson
Date:      2015-08-18 13:14 +0200
URL:       http://hg.openjdk.java.net/jdk9/sandbox/jdk/rev/ae3fbf73bc45

Merge

- src/java.base/share/classes/jdk/internal/jimage/ImageFile.java
- src/java.base/share/classes/jdk/internal/jimage/ImageModules.java
- src/java.base/share/classes/jdk/internal/jimage/PReader.java
- src/java.base/share/classes/jdk/internal/jimage/PackageModuleMap.java
- src/java.base/share/classes/jdk/internal/jimage/Resource.java
- src/java.base/share/classes/jdk/internal/jimage/concurrent/ConcurrentPReader.java
- src/java.base/share/classes/sun/text/normalizer/ICUData.java
- src/java.base/share/classes/sun/text/normalizer/IntTrie.java
- src/java.base/share/classes/sun/text/normalizer/NormalizerDataReader.java
- src/java.base/share/classes/sun/text/normalizer/RangeValueIterator.java
- src/java.base/share/classes/sun/text/normalizer/RuleCharacterIterator.java
- src/java.base/share/classes/sun/text/normalizer/SymbolTable.java
- src/java.base/share/classes/sun/text/normalizer/TrieIterator.java
- src/java.base/share/classes/sun/text/normalizer/UCharacterPropertyReader.java
- src/java.base/share/classes/sun/text/normalizer/UnicodeMatcher.java
- src/java.base/share/classes/sun/text/normalizer/UnicodeSetIterator.java
- src/java.base/share/classes/sun/text/resources/unorm.icu
- src/java.base/unix/native/libjava/ConcurrentPReader_md.c
- src/java.base/windows/native/libjava/ConcurrentPReader_md.c
- test/demo/jvmti/hprof/CpuOldTest.java
- test/demo/jvmti/hprof/CpuSamplesTest.java
- test/demo/jvmti/hprof/CpuTimesDefineClassTest.java
- test/demo/jvmti/hprof/CpuTimesTest.java
- test/demo/jvmti/hprof/DefineClass.java
- test/demo/jvmti/hprof/HeapAllTest.java
- test/demo/jvmti/hprof/HeapBinaryFormatTest.java
- test/demo/jvmti/hprof/HeapDumpTest.java
- test/demo/jvmti/hprof/HeapSitesTest.java
- test/demo/jvmti/hprof/HelloWorld.java
- test/demo/jvmti/hprof/MonitorTest.java
- test/demo/jvmti/hprof/OptionsTest.java
- test/demo/jvmti/hprof/StackMapTableTest.java
- test/demo/jvmti/hprof/UseAllBytecodes.java