JDK-8316645 was backported to 17u without the relevant test additions, because the test file was missing. But now, after the series of atomic support backports, we have the test file, so we can now complete the backport with the test hunks.

Compare 17u-dev version:
 https://github.com/openjdk/jdk17u-dev/commit/db83123c5cc054cee5663201ead92410e6487d81

...and the mainline:
 https://github.com/openjdk/jdk/commit/fb055e7e5300958b2a6a290aa6783e8ede929d9a

This change adds the missing hunk from mainline change. It includes JDK-8317335 fix as well.