odhcpd: backport trunk fixes