Reduce merge conflicts in VerifyCACerts

[rgithubli]

Backport of corretto/corretto-17@fe7ab0b.

Had to do some syntax changes. E.g.:

public static final Map<String, String> AMAZON_CA_FINGERPRINT_MAP = new HashMap<String, String>()

instead of using

public static final Map<String, String> AMAZON_CA_FINGERPRINT_MAP = new HashMap<>()

due to 8 differences.

Test passed locally:

x64-2 (develop) % /workplace/ruiamzn/github/corretto-8/jtreg/bin/jtreg -va -jdk:/workplace/ruiamzn/github/corretto-8/installers/linux/universal/tar/corretto-build/amazon-corretto-8.382.04.1-linux-x64 \
/workplace/ruiamzn/github/corretto-8/jdk/test/sun/security/lib/cacerts/VerifyCACerts.java

....
TEST RESULT: Passed. Execution successful
...