Merge "Refactor JVMTI ClassFileLoadHook handling"