Merge "Add a whitelist of sockets on fork." into nyc-mr1-dev