[Bug 225691] Merge Review: dhcp