Merge "Add a test for attach/detach port on multiple servers"