Merge "When fork() fails, clean up data structures." into nyc-dev