Merge "Unskip test_reassign_port_between_servers"