Add dhcp support for interfaces and fix mainline sync issues