DHCP fixes from v2.1.x
Merge pull request #210 from arr2036/master

DHCP fixes