Merge "Temporarily @ignore test_reconnect"