Merge "Verify ObjectStreamField against upstream OpenJDK 8u121-b13"