Merge "Add test to verify DHCP port IP address modification"