odhcpd: backport fixes from master branch (FS#402, FS#524)