Forward port of issue #24513 to 2.4.x.
Comment From: snicoll
The JDK14 reference has been previously removed as of 2.4.x