8244955: Additional Fix for JDK-8240124

Reviewed-by: mbalao, andrew
10 files changed