Merge conflicts between dhcp-4.4.2P1 and dhcp-4.4.3

Gut omapip support since the socket stuff to support it is gone, and
adjust to the new isc library reality.

sync our changes.

import dhcp-4.4.1