Fixes #5648 - Match the DHCP specification of last-lease-wins
minor cleanups to tests
fixed broken tests
Added DHCP as a module