Merge "Integrate upstream changes forgotten in the update to OpenJDK 8u60"