fixing dhcp for cp1058/59

Change-Id: I8f10ae045a98b1dc41f2cb62e40ab5c73e53e47a
Merge "fixing dhcp for cp1058/59" into production