hg: amber/amber: Automatic merge with patterns-stage-1

[maurizio.cimadamore at oracle.com]

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

Automatic merge with patterns-stage-1

- src/hotspot/share/gc/g1/dirtyCardQueue.cpp
- src/hotspot/share/gc/g1/dirtyCardQueue.hpp
- 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