Merge "Make jvmti tests runnable on the RI again."