Merge "Improve test_amphora_failover" into mcp/victoria