Merge "DHCP should be disabled on external subnet"