hg: panama/dev: Manual merge with default

[henry.jen at oracle.com]

Changeset: dd9ee9434abe
Author:    henryjen
Date:      2018-05-31 12:46 -0700
URL:       http://hg.openjdk.java.net/panama/dev/rev/dd9ee9434abe

Manual merge with default

- make/BuildNashorn.gmk
! make/CompileJavaModules.gmk
- make/UnpackSecurity.gmk
! src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp
! src/hotspot/cpu/ppc/methodHandles_ppc.cpp
! src/hotspot/cpu/x86/macroAssembler_x86.cpp
! src/hotspot/cpu/x86/x86_64.ad
- src/hotspot/os/aix/jvm_aix.cpp
- src/hotspot/os/bsd/jvm_bsd.cpp
- src/hotspot/os/linux/jvm_linux.cpp
- src/hotspot/os/solaris/jvm_solaris.cpp
! src/hotspot/share/classfile/javaClasses.cpp
! src/hotspot/share/classfile/systemDictionary.cpp
! src/hotspot/share/classfile/systemDictionary.hpp
- src/hotspot/share/jfr/metadata/GenerateJfrFiles.java
- src/hotspot/share/memory/metachunk.cpp
- src/hotspot/share/memory/metachunk.hpp
! src/hotspot/share/opto/compile.cpp
! src/hotspot/share/opto/escape.cpp
! src/hotspot/share/opto/graphKit.cpp
! src/hotspot/share/opto/graphKit.hpp
! src/hotspot/share/opto/library_call.cpp
! src/hotspot/share/opto/macro.cpp
! src/hotspot/share/opto/macro.hpp
! src/hotspot/share/opto/phasetype.hpp
! src/hotspot/share/runtime/vmStructs.cpp
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/BaseExecutableMemberTaglet.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/BaseInlineTaglet.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/HiddenTaglet.java
- test/jdk/java/lang/Character/Blocks.txt
- test/jdk/java/lang/Character/CheckBlocks.java
- test/jdk/java/lang/Character/TestISOControls.java