Apply upstream fix for test_remove_watch_file flakiness Apply upstream fix for test_vterm handling of NUL characters