hg: jdk9/sandbox/jdk: Merge

[stuart.marks at oracle.com]

Changeset: f518f3cf64ab
Author:    smarks
Date:      2015-08-25 13:40 -0700
URL:       http://hg.openjdk.java.net/jdk9/sandbox/jdk/rev/f518f3cf64ab

Merge

- make/copy/Copy-jdk.hprof.agent.gmk
- make/launcher/Launcher-jdk.scripting.nashorn.gmk
- make/lib/Lib-jdk.hprof.agent.gmk
- make/mapfiles/libhprof/mapfile-vers
- make/mapfiles/libjava_crw_demo/mapfile-vers
! src/java.base/share/classes/java/util/ArrayList.java
! src/java.base/share/classes/java/util/HashMap.java
! src/java.base/share/classes/java/util/HashSet.java
! src/java.base/share/classes/java/util/List.java
! src/java.base/share/classes/java/util/Map.java
! src/java.base/share/classes/java/util/Set.java
- src/jdk.charsets/share/classes/sun/nio/cs/ext/GB18030.java
- src/jdk.deploy.osx/macosx/classes/apple/security/AppleProvider.java
- src/jdk.deploy.osx/macosx/classes/apple/security/KeychainStore.java
- src/jdk.deploy.osx/macosx/native/libosx/KeystoreImpl.m
- src/jdk.hprof.agent/aix/native/libhprof/porting_aix.c
- src/jdk.hprof.agent/aix/native/libhprof/porting_aix.h
- src/jdk.hprof.agent/share/classes/com/sun/demo/jvmti/hprof/Tracker.java
- src/jdk.hprof.agent/share/native/libhprof/README.txt
- src/jdk.hprof.agent/share/native/libhprof/debug_malloc.c
- src/jdk.hprof.agent/share/native/libhprof/debug_malloc.h
- src/jdk.hprof.agent/share/native/libhprof/hprof.h
- src/jdk.hprof.agent/share/native/libhprof/hprof_b_spec.h
- src/jdk.hprof.agent/share/native/libhprof/hprof_blocks.c
- src/jdk.hprof.agent/share/native/libhprof/hprof_blocks.h
- src/jdk.hprof.agent/share/native/libhprof/hprof_check.c
- src/jdk.hprof.agent/share/native/libhprof/hprof_check.h
- src/jdk.hprof.agent/share/native/libhprof/hprof_class.c
- src/jdk.hprof.agent/share/native/libhprof/hprof_class.h
- src/jdk.hprof.agent/share/native/libhprof/hprof_cpu.c
- src/jdk.hprof.agent/share/native/libhprof/hprof_cpu.h
- src/jdk.hprof.agent/share/native/libhprof/hprof_error.c
- src/jdk.hprof.agent/share/native/libhprof/hprof_error.h
- src/jdk.hprof.agent/share/native/libhprof/hprof_event.c
- src/jdk.hprof.agent/share/native/libhprof/hprof_event.h
- src/jdk.hprof.agent/share/native/libhprof/hprof_frame.c
- src/jdk.hprof.agent/share/native/libhprof/hprof_frame.h
- src/jdk.hprof.agent/share/native/libhprof/hprof_init.c
- src/jdk.hprof.agent/share/native/libhprof/hprof_init.h
- src/jdk.hprof.agent/share/native/libhprof/hprof_io.c
- src/jdk.hprof.agent/share/native/libhprof/hprof_io.h
- src/jdk.hprof.agent/share/native/libhprof/hprof_ioname.c
- src/jdk.hprof.agent/share/native/libhprof/hprof_ioname.h
- src/jdk.hprof.agent/share/native/libhprof/hprof_listener.c
- src/jdk.hprof.agent/share/native/libhprof/hprof_listener.h
- src/jdk.hprof.agent/share/native/libhprof/hprof_loader.c
- src/jdk.hprof.agent/share/native/libhprof/hprof_loader.h
- src/jdk.hprof.agent/share/native/libhprof/hprof_md.h
- src/jdk.hprof.agent/share/native/libhprof/hprof_monitor.c
- src/jdk.hprof.agent/share/native/libhprof/hprof_monitor.h
- src/jdk.hprof.agent/share/native/libhprof/hprof_object.c
- src/jdk.hprof.agent/share/native/libhprof/hprof_object.h
- src/jdk.hprof.agent/share/native/libhprof/hprof_reference.c
- src/jdk.hprof.agent/share/native/libhprof/hprof_reference.h
- src/jdk.hprof.agent/share/native/libhprof/hprof_site.c
- src/jdk.hprof.agent/share/native/libhprof/hprof_site.h
- src/jdk.hprof.agent/share/native/libhprof/hprof_stack.c
- src/jdk.hprof.agent/share/native/libhprof/hprof_stack.h
- src/jdk.hprof.agent/share/native/libhprof/hprof_string.c
- src/jdk.hprof.agent/share/native/libhprof/hprof_string.h
- src/jdk.hprof.agent/share/native/libhprof/hprof_table.c
- src/jdk.hprof.agent/share/native/libhprof/hprof_table.h
- src/jdk.hprof.agent/share/native/libhprof/hprof_tag.c
- src/jdk.hprof.agent/share/native/libhprof/hprof_tag.h
- src/jdk.hprof.agent/share/native/libhprof/hprof_tls.c
- src/jdk.hprof.agent/share/native/libhprof/hprof_tls.h
- src/jdk.hprof.agent/share/native/libhprof/hprof_trace.c
- src/jdk.hprof.agent/share/native/libhprof/hprof_trace.h
- src/jdk.hprof.agent/share/native/libhprof/hprof_tracker.c
- src/jdk.hprof.agent/share/native/libhprof/hprof_tracker.h
- src/jdk.hprof.agent/share/native/libhprof/hprof_util.c
- src/jdk.hprof.agent/share/native/libhprof/hprof_util.h
- src/jdk.hprof.agent/share/native/libhprof/jvm.hprof.txt
- src/jdk.hprof.agent/share/native/libhprof/manual.html
- src/jdk.hprof.agent/unix/native/libhprof/hprof_md.c
- src/jdk.hprof.agent/windows/native/libhprof/hprof_md.c
! test/TEST.groups
- test/sun/jvmstat/monitor/MonitoredVm/CR6672135.java