Merge "DHCP for TOR VMs"