rebase dhcp_checker to master
stylistic cleanup