hg: panama/dev: Automatic merge with default

[maurizio.cimadamore at oracle.com]

Changeset: d9a5f505427d
Author:    mcimadamore
Date:      2018-05-16 22:09 +0200
URL:       http://hg.openjdk.java.net/panama/dev/rev/d9a5f505427d

Automatic merge with default

! make/CompileJavaModules.gmk
- src/hotspot/share/runtime/vmStructs_trace.hpp
- src/hotspot/share/trace/noTraceBackend.hpp
- src/hotspot/share/trace/trace.dtd
- src/hotspot/share/trace/trace.xml
- src/hotspot/share/trace/traceBackend.cpp
- src/hotspot/share/trace/traceBackend.hpp
- src/hotspot/share/trace/traceDataTypes.hpp
- src/hotspot/share/trace/traceEvent.hpp
- src/hotspot/share/trace/traceEventClasses.xsl
- src/hotspot/share/trace/traceEventIds.xsl
- src/hotspot/share/trace/traceMacros.hpp
- src/hotspot/share/trace/traceStream.cpp
- src/hotspot/share/trace/traceStream.hpp
- src/hotspot/share/trace/traceTime.hpp
- src/hotspot/share/trace/traceTypes.xsl
- src/hotspot/share/trace/traceevents.xml
- src/hotspot/share/trace/tracerelationdecls.xml
- src/hotspot/share/trace/tracetypes.xml
- src/hotspot/share/trace/tracing.hpp
- src/hotspot/share/trace/tracingExport.cpp
- src/hotspot/share/trace/tracingExport.hpp
- src/hotspot/share/trace/xinclude.mod
- src/hotspot/share/trace/xsl_util.xsl
- src/hotspot/share/utilities/ticks.inline.hpp
- src/java.base/macosx/conf/x86_64/jvm.cfg
! src/java.base/share/classes/module-info.java
- src/java.base/unix/conf/aarch64/jvm.cfg
- src/java.base/unix/conf/amd64/jvm.cfg
- src/java.base/unix/conf/arm/jvm.cfg
- src/java.base/unix/conf/i586/jvm.cfg
- src/java.base/unix/conf/ia64/jvm.cfg
- src/java.base/unix/conf/ppc64/jvm.cfg
- src/java.base/unix/conf/ppc64le/jvm.cfg
- src/java.base/unix/conf/s390x/jvm.cfg
- src/java.base/unix/conf/sparc/jvm.cfg
- src/java.base/unix/conf/sparcv9/jvm.cfg
- src/java.base/unix/conf/zero/jvm.cfg
- src/java.base/windows/conf/amd64/jvm.cfg
- src/java.base/windows/conf/i586/jvm.cfg
- src/java.base/windows/conf/ia64/jvm.cfg