OT and PIT planning update to Java 6