Merge "Revert "Revert^2 "JVMTI PopFrame support"""