Merge "Fix problem of deleting dhcp port"