hg: amber/amber: Automatic merge with pattern-runtime

[maurizio.cimadamore at oracle.com]

Changeset: f41821a144b2
Author:    mcimadamore
Date:      2020-02-13 22:07 +0000
URL:       https://hg.openjdk.java.net/amber/amber/rev/f41821a144b2

Automatic merge with pattern-runtime

- make/CopyInterimCLDRConverter.gmk
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/jszip-utils/dist/jszip-utils-ie.js
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/jszip-utils/dist/jszip-utils-ie.min.js
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/jszip-utils/dist/jszip-utils.js
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/jszip-utils/dist/jszip-utils.min.js
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/jszip/dist/jszip.js
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/jszip/dist/jszip.min.js
- src/jdk.javadoc/share/legal/jszip.md
- test/hotspot/jtreg/runtime/CDSCompressedKPtrs/CDSCompressedKPtrsError.java
- test/jdk/java/net/httpclient/ssltest/bad.keystore
- test/jdk/java/net/httpclient/ssltest/good.keystore
- test/jdk/java/net/httpclient/ssltest/loopback.keystore