Merge "Fix "run-test --jvm 067-preemptive-unpark""