Merge "Fix ObjectStreamClassTest classloader and serial version failures."