hg: amber/amber: Automatic merge with default

[maurizio.cimadamore at oracle.com]

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

Automatic merge with default

- make/CopyInterimCLDRConverter.gmk
! src/java.base/share/classes/module-info.java
- 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