Merge pull request #43842 from srhb/jdk-backport
Backport of #43811 jdk updates (help needed)
authored by Andreas Rammhold and committed by GitHub 7 years ago bfa517dc 54a20762