hg: panama/dev: manual merge with nicl

[henry.jen at oracle.com]

Changeset: 6372a5f25095
Author:    henryjen
Date:      2018-06-20 15:43 -0700
URL:       http://hg.openjdk.java.net/panama/dev/rev/6372a5f25095

manual merge with nicl

- src/hotspot/share/gc/g1/g1StringDedupTable.cpp
- src/hotspot/share/gc/g1/g1StringDedupTable.hpp
- src/hotspot/share/gc/g1/g1StringDedupThread.cpp
- src/hotspot/share/gc/g1/g1StringDedupThread.hpp
! src/java.base/share/classes/java/lang/ClassLoader.java
! src/java.base/share/classes/module-info.java
- src/java.desktop/share/classes/sun/applet/AppletAudioClip.java
- src/java.net.http/share/classes/jdk/internal/net/http/ImmutableHeaders.java
- src/java.net.http/share/classes/jdk/internal/net/http/common/HttpHeadersImpl.java
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/algorithms/implementations/package.html
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/algorithms/package.html
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/helper/package.html
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer11.java
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/package.html
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/package.html
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/AbstractSerializer.java
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/AgreementMethod.java
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/CipherData.java
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/CipherReference.java
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/CipherValue.java
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/DocumentSerializer.java
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptedData.java
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptedKey.java
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptedType.java
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptionMethod.java
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptionProperties.java
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptionProperty.java
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/Reference.java
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/ReferenceList.java
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/Serializer.java
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/Transforms.java
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/XMLCipher.java
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/XMLCipherInput.java
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/XMLCipherParameters.java
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/XMLEncryptionException.java
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/package.html
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/exceptions/package.html
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/keyvalues/package.html
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/package.html
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/package.html
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/EncryptedKeyResolver.java
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/package.html
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/package.html
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/package.html
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/implementations/package.html
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/package.html
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/package.html
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/resource/package.html
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/package.html
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/package.html
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/package.html
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/ElementChecker.java
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/ElementCheckerImpl.java
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/EncryptionElementProxy.java
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/package.html
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/package.html
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/package.html
- src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMCryptoBinary.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jquery-1.12.4.js
- test/hotspot/jtreg/runtime/exceptionMsgs/IncompatibleClassChangeError/ICC_B.jasm
- test/hotspot/jtreg/serviceability/tmtools/jstat/utils/ClassLoadUtils.java
- test/hotspot/jtreg/serviceability/tmtools/jstat/utils/GeneratingClassLoader.java
- test/hotspot/jtreg/serviceability/tmtools/jstat/utils/TemplateClass.java
- test/hotspot/jtreg/vmTestbase/heapdump/JMapHeap/TEST.properties
- test/hotspot/jtreg/vmTestbase/heapdump/JMapHeap/TestDescription.java
- test/hotspot/jtreg/vmTestbase/heapdump/JMapHeap/run.sh
- test/hotspot/jtreg/vmTestbase/heapdump/JMapHeapCore/TestDescription.java
- test/hotspot/jtreg/vmTestbase/heapdump/JMapHeapCore/run.sh
- test/hotspot/jtreg/vmTestbase/heapdump/JMapMetaspace/TEST.properties
- test/hotspot/jtreg/vmTestbase/heapdump/JMapMetaspace/TestDescription.java
- test/hotspot/jtreg/vmTestbase/heapdump/JMapMetaspace/run.sh
- test/hotspot/jtreg/vmTestbase/heapdump/JMapMetaspaceCore/TEST.properties
- test/hotspot/jtreg/vmTestbase/heapdump/JMapMetaspaceCore/TestDescription.java
- test/hotspot/jtreg/vmTestbase/heapdump/JMapMetaspaceCore/run.sh
- test/hotspot/jtreg/vmTestbase/heapdump/OnOOMToFile/TEST.properties
- test/hotspot/jtreg/vmTestbase/heapdump/OnOOMToFile/TestDescription.java
- test/hotspot/jtreg/vmTestbase/heapdump/OnOOMToFile/run.sh
- test/hotspot/jtreg/vmTestbase/heapdump/OnOOMToFileMetaspace/TEST.properties
- test/hotspot/jtreg/vmTestbase/heapdump/OnOOMToFileMetaspace/TestDescription.java
- test/hotspot/jtreg/vmTestbase/heapdump/OnOOMToFileMetaspace/run.sh
- test/hotspot/jtreg/vmTestbase/heapdump/OnOOMToPath/TEST.properties
- test/hotspot/jtreg/vmTestbase/heapdump/OnOOMToPath/TestDescription.java
- test/hotspot/jtreg/vmTestbase/heapdump/OnOOMToPath/run.sh
- test/hotspot/jtreg/vmTestbase/heapdump/README
- test/hotspot/jtreg/vmTestbase/heapdump/share/EatMemory.java
- test/hotspot/jtreg/vmTestbase/heapdump/share/common.sh
- test/jdk/java/net/httpclient/ThrowingPublishers.java
- test/jdk/java/net/httpclient/ThrowingPushPromises.java
- test/jdk/java/net/httpclient/ThrowingSubscribers.java
- test/jdk/java/net/httpclient/offline/FixedHttpHeaders.java
- test/jdk/java/util/Formatter/NoGroupingUsed.java
- test/jdk/sanity/releaseFile/CheckSource.java
- test/jdk/sun/text/resources/JavaTimeSupplementaryTest.java