hg: amber/amber: Automatic merge with default

[maurizio.cimadamore at oracle.com]

Changeset: 4d3b65857384
Author:    mcimadamore
Date:      2019-02-14 22:07 +0100
URL:       http://hg.openjdk.java.net/amber/amber/rev/4d3b65857384

Automatic merge with default

! make/Init.gmk
! make/Main.gmk
! make/MainSupport.gmk
! make/autoconf/basics.m4
! make/autoconf/spec.gmk.in
! src/hotspot/cpu/x86/templateTable_x86.cpp
! src/hotspot/share/ci/ciStreams.cpp
! src/hotspot/share/classfile/classFileParser.cpp
! src/hotspot/share/classfile/systemDictionary.cpp
! src/hotspot/share/classfile/systemDictionary.hpp
- src/hotspot/share/gc/g1/dirtyCardQueue.cpp
- src/hotspot/share/gc/g1/dirtyCardQueue.hpp
! src/hotspot/share/interpreter/bytecodeTracer.cpp
! src/hotspot/share/interpreter/interpreterRuntime.cpp
! src/hotspot/share/interpreter/linkResolver.cpp
! src/hotspot/share/interpreter/linkResolver.hpp
! src/hotspot/share/interpreter/rewriter.cpp
! src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
! src/hotspot/share/oops/constantPool.cpp
! src/hotspot/share/oops/constantPool.hpp
! src/hotspot/share/prims/jvmtiRedefineClasses.cpp
! src/hotspot/share/prims/methodHandles.cpp
! src/hotspot/share/runtime/globals.hpp
! src/hotspot/share/utilities/constantTag.hpp
! src/hotspot/share/utilities/exceptions.cpp
- src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/output_html.properties
- src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/output_text.properties
- src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/output_unknown.properties
- src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/output_xml.properties
! src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
- test/jdk/sun/security/krb5/auto/rcache_usemd5.sh
- test/jdk/sun/security/krb5/tools/ktarg.sh
- test/jdk/sun/security/krb5/tools/ktcheck.sh
- test/jdk/sun/security/krb5/tools/ktmissing.sh
- test/jdk/sun/security/krb5/tools/ktzero.sh
- test/jdk/sun/security/pkcs11/fips/CipherTest.java
- test/jdk/sun/security/pkcs11/fips/ClientJSSEServerJSSE.java
- test/jdk/sun/security/pkcs11/fips/ImportKeyStore.java
- test/jdk/sun/security/pkcs11/fips/JSSEClient.java
- test/jdk/sun/security/pkcs11/fips/JSSEServer.java
- test/jdk/sun/security/pkcs11/fips/TestTLS12.java
- test/jdk/sun/security/pkcs11/fips/TrustManagerTest.java
- test/jdk/sun/security/pkcs11/fips/TrustManagerTest.policy
- test/jdk/sun/security/pkcs11/fips/cert8.db
- test/jdk/sun/security/pkcs11/fips/certs/anchor.cer
- test/jdk/sun/security/pkcs11/fips/certs/ca.cer
- test/jdk/sun/security/pkcs11/fips/certs/server.cer
- test/jdk/sun/security/pkcs11/fips/fips.cfg
- test/jdk/sun/security/pkcs11/fips/key3.db
- test/jdk/sun/security/pkcs11/fips/keystore
- test/jdk/sun/security/pkcs11/fips/secmod.db
- test/jdk/sun/security/pkcs11/fips/truststore
! test/langtools/tools/javac/diags/examples.not-yet.txt