RFR: 7896: Merge changes of 8.2.1 into master branch

[Virag Purnam]

Merging changes of 8.2.1 into master branch.

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

Commit messages:
 - 7896: Merge changes of 8.2.1 into master branch

Changes: https://git.openjdk.org/jmc/pull/424/files
 Webrev: https://webrevs.openjdk.org/?repo=jmc&pr=424&range=00
  Issue: https://bugs.openjdk.org/browse/JMC-7896
  Stats: 11 lines in 4 files changed: 8 ins; 0 del; 3 mod
  Patch: https://git.openjdk.org/jmc/pull/424.diff
  Fetch: git fetch https://git.openjdk.org/jmc pull/424/head:pull/424

PR: https://git.openjdk.org/jmc/pull/424