hg: panama/dev: Automatic merge with default

[maurizio.cimadamore at oracle.com]

Changeset: c2994858f206
Author:    mcimadamore
Date:      2018-05-30 22:10 +0200
URL:       http://hg.openjdk.java.net/panama/dev/rev/c2994858f206

Automatic merge with default

- make/BuildNashorn.gmk
! make/CompileJavaModules.gmk
- make/UnpackSecurity.gmk
- 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/jfr/metadata/GenerateJfrFiles.java
- src/hotspot/share/memory/metachunk.cpp
- src/hotspot/share/memory/metachunk.hpp
- 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