Merge "Add global setting to use new DHCPv4 server"