Merge "Fix tunnelxconn create/delete ip bugs"