Merge "Increase JVMTI test timeout to 5 minutes"