Port specific DHCP changes

Change-Id: I30bb58f09d457bda2edc6a96f81471d9d0c438c3
Merge "Port specific DHCP changes"