Merge "The legacy DHCP client is gone. Delete the settings." into nyc-dev