Merge "Extra dhcp options on port"

Change-Id: I3c339163d5081f616831505a07e1d793d030cb30