Merge "Bug 2971: tp-id format is incorrect for host switch pair"