[Backport] 18309: fix of jdk-8180450 #317

Job	Run time
Prerequisites / Check Commit Message	2m 51s
Prerequisites / Prerequisites	43s
linux-aarch64 / build (debug)	7m 33s
linux-aarch64 / build (release)	22m 20s
windows-x64 / build (debug)	7m 52s
riscv64 / build (release)	24m 3s
windows-x64 / build (release)	9m 8s
linux-x64 / build (debug)	25m 28s
linux-x64 / build (release)	24m 55s
windows-x64	0s
linux-aarch64	0s
linux-x64 / test (jdk/tier1 part 1)	12m 0s
linux-x64 / test (jdk/tier1 part 2)	10m 49s
linux-x64 / test (jdk/tier1 part 3)	4m 30s
linux-x64 / test (langtools/tier1)	20m 17s
linux-x64 / test (hs/tier1 common)	1m 57s
linux-x64 / test (hs/tier1 compiler)	22m 11s
linux-x64 / test (hs/tier1 gc)	23m 2s
linux-x64 / test (hs/tier1 runtime)	6m 55s
linux-x64 / test (hs/tier1 serviceability)	4m 0s
linux-x64 / test (dragonwell/hs feature)	5m 8s
linux-x64 / test (dragonwell/jdk feature)	4m 58s
Remove bundle artifacts	0s
	4h 0m 40s

Provide feedback