hg: panama/dev: Automatic merge with default

[maurizio.cimadamore at oracle.com]

Changeset: 86c4d4fc58c1
Author:    mcimadamore
Date:      2018-12-05 22:10 +0100
URL:       http://hg.openjdk.java.net/panama/dev/rev/86c4d4fc58c1

Automatic merge with default

- make/nashorn/package-list
! src/hotspot/share/classfile/javaClasses.cpp
! src/hotspot/share/classfile/javaClasses.hpp
! src/hotspot/share/classfile/vmSymbols.hpp
! src/hotspot/share/code/codeCache.hpp
! src/hotspot/share/opto/vectornode.hpp
! src/hotspot/share/prims/methodHandles.cpp
! src/hotspot/share/prims/methodHandles.hpp
! src/hotspot/share/runtime/globals.hpp
! src/hotspot/share/runtime/mutexLocker.cpp
! src/hotspot/share/runtime/sharedRuntime.hpp
! src/hotspot/share/runtime/vmStructs.cpp
! src/java.base/share/classes/java/lang/invoke/MethodHandleNatives.java
- src/java.desktop/macosx/native/libsplashscreen/libpng/zlibwrapper/zlib.h
- src/jdk.jfr/share/classes/jdk/jfr/internal/cmd/Command.java
- src/jdk.jfr/share/classes/jdk/jfr/internal/cmd/Execute.java
- src/jdk.jfr/share/classes/jdk/jfr/internal/cmd/HelpCommand.java
- src/jdk.jfr/share/classes/jdk/jfr/internal/cmd/JSONWriter.java
- src/jdk.jfr/share/classes/jdk/jfr/internal/cmd/PrettyWriter.java
- src/jdk.jfr/share/classes/jdk/jfr/internal/cmd/PrintCommand.java
- src/jdk.jfr/share/classes/jdk/jfr/internal/cmd/ReconstructCommand.java
- src/jdk.jfr/share/classes/jdk/jfr/internal/cmd/SplitCommand.java
- src/jdk.jfr/share/classes/jdk/jfr/internal/cmd/StructuredWriter.java
- src/jdk.jfr/share/classes/jdk/jfr/internal/cmd/SummaryCommand.java
- src/jdk.jfr/share/classes/jdk/jfr/internal/cmd/XMLWriter.java
- test/jdk/java/awt/Choice/ChoiceKeyEventReaction/ChoiceKeyEventReaction.html
- test/jdk/java/util/Properties/Compatibility.xml
- test/jdk/java/util/Properties/CompatibilityTest.java
- test/jdk/jdk/jfr/cmd/ExecuteHelper.java
- test/jdk/jdk/jfr/cmd/TestHelp.java
- test/jdk/jdk/jfr/cmd/TestPrint.java
- test/jdk/jdk/jfr/cmd/TestPrintDefault.java
- test/jdk/jdk/jfr/cmd/TestPrintJSON.java
- test/jdk/jdk/jfr/cmd/TestPrintXML.java
- test/jdk/jdk/jfr/cmd/TestReconstruct.java
- test/jdk/jdk/jfr/cmd/TestSplit.java
- test/jdk/jdk/jfr/cmd/TestSummary.java
- test/jdk/lib/testlibrary/ExtendedRobot.java