Merge "Make dhcp enforcing."