RFR: Merge jdk:master [v2]

[Jorn Vernee]

> Manual merge of jdk:master into master

Jorn Vernee has refreshed the contents of this pull request, and previous commits have been removed. The incremental views will show differences compared to the previous content of the PR. The pull request contains two new commits since the last revision:

 - Merge branch 'jdk_master' into Merge_Master
 - 8287154: java/nio/channels/FileChannel/LargeMapTest.java does not compile
   
   Reviewed-by: alanb, jvernee

-------------

Changes:
  - all: https://git.openjdk.java.net/panama-foreign/pull/684/files
  - new: https://git.openjdk.java.net/panama-foreign/pull/684/files/70dcbf16..e461c245

Webrevs:
 - full: https://webrevs.openjdk.java.net/?repo=panama-foreign&pr=684&range=01
 - incr: https://webrevs.openjdk.java.net/?repo=panama-foreign&pr=684&range=00-01

  Stats: 1 line in 1 file changed: 0 ins; 0 del; 1 mod
  Patch: https://git.openjdk.java.net/panama-foreign/pull/684.diff
  Fetch: git fetch https://git.openjdk.java.net/panama-foreign pull/684/head:pull/684

PR: https://git.openjdk.java.net/panama-foreign/pull/684