Merge "Minor logging fixes for new DHCP server"