Merge pull request #394 from olafhering/olh-misc

DHCP4 changes (bnc#866994)