hg: amber/amber: Automatic merge with default

[maurizio.cimadamore at oracle.com]

Changeset: 5bc945beddb1
Author:    mcimadamore
Date:      2019-01-03 21:27 +0100
URL:       http://hg.openjdk.java.net/amber/amber/rev/5bc945beddb1

Automatic merge with default

- src/hotspot/share/runtime/arguments_ext.hpp
- src/hotspot/share/services/diagnosticCommand_ext.hpp
! src/java.base/share/classes/java/lang/String.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/main/JavaCompiler.java
- src/utils/LogCompilation/src/test/resources/hotspot_pid23756.log
- src/utils/LogCompilation/src/test/resources/hotspot_pid25109.log
- src/utils/LogCompilation/src/test/resources/no_tiered_short.log
- src/utils/LogCompilation/src/test/resources/tiered_short.log
- test/hotspot/jtreg/serviceability/jvmti/HeapMonitor/MyPackage/HeapMonitorEventsForTwoThreadsTest.java
- test/jdk/java/net/MulticastSocket/PromiscuousIPv6.java
- test/jdk/java/nio/channels/DatagramChannel/PromiscuousIPv6.java
- test/langtools/jdk/javadoc/doclet/lib/JavadocTester.java
! test/langtools/jdk/javadoc/doclet/testClassTree/TestClassTree.java