Merge "Clean up dhcp no-op logging"