hg: amber/amber: Automatic merge with default

[maurizio.cimadamore at oracle.com]

Changeset: 86c841195d6c
Author:    mcimadamore
Date:      2020-04-07 18:31 +0000
URL:       https://hg.openjdk.java.net/amber/amber/rev/86c841195d6c

Automatic merge with default

- make/CompileInterimRmic.gmk
- make/common/RMICompilation.gmk
- make/jdk/src/classes/build/tools/util/Header.java
- make/rmic/Rmic-java.management.rmi.gmk
- make/rmic/Rmic-java.rmi.gmk
- make/rmic/Rmic-jdk.naming.rmi.gmk
- make/rmic/RmicCommon.gmk
- src/demo/share/jfc/Font2DTest/Font2DTestApplet.java
- src/demo/share/jfc/SwingSet2/SwingSet2Applet.java
- src/hotspot/share/gc/shenandoah/heuristics/shenandoahTraversalAggressiveHeuristics.cpp
- src/hotspot/share/gc/shenandoah/heuristics/shenandoahTraversalAggressiveHeuristics.hpp
- src/hotspot/share/gc/shenandoah/heuristics/shenandoahTraversalHeuristics.cpp
- src/hotspot/share/gc/shenandoah/heuristics/shenandoahTraversalHeuristics.hpp
- src/hotspot/share/gc/shenandoah/shenandoahTraversalGC.cpp
- src/hotspot/share/gc/shenandoah/shenandoahTraversalGC.hpp
- src/hotspot/share/gc/shenandoah/shenandoahTraversalGC.inline.hpp
- src/hotspot/share/gc/shenandoah/shenandoahTraversalMode.cpp
- src/hotspot/share/gc/shenandoah/shenandoahTraversalMode.hpp
- src/java.base/share/classes/com/sun/security/cert/internal/x509/X509V1CertImpl.java
- src/java.rmi/share/doc/stub/java/rmi/activation/ActivationGroup_Stub.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java
- src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/dumb-colors.caps
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/UnsafeLoadSnippets.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/MemoryNode.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/MemoryProxy.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeFieldWriterImpl.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeWriterImpl.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlTag.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/AnnotationTypeFieldWriter.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/AnnotationTypeWriter.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/AnnotationTypeBuilder.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/AnnotationTypeFieldBuilder.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/BasePropertyTaglet.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/PropertyGetterTaglet.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/PropertySetterTaglet.java
- test/hotspot/jtreg/vmTestbase/gc/gctests/Steal/steal001/TEST.properties
- test/hotspot/jtreg/vmTestbase/gc/gctests/Steal/steal001/steal001.java
- test/hotspot/jtreg/vmTestbase/gc/gctests/Steal/steal002/TEST.properties
- test/hotspot/jtreg/vmTestbase/gc/gctests/Steal/steal002/steal002.java
- test/jdk/java/awt/TrayIcon/AddPopupAfterShowTest/AddPopupAfterShowTest.html
- test/jdk/sun/management/jmxremote/bootstrap/Makefile
- test/jdk/sun/management/jmxremote/bootstrap/launcher.c
- test/jdk/sun/management/jmxremote/bootstrap/linux-amd64/launcher
- test/jdk/sun/management/jmxremote/bootstrap/linux-i586/launcher
- test/jdk/sun/management/jmxremote/bootstrap/solaris-amd64/launcher
- test/jdk/sun/management/jmxremote/bootstrap/solaris-sparcv9/launcher
- test/jdk/sun/tools/jps/LingeredApp.java