Merge "Make cts JVMTI tests more consistent"