Merge "Patch to fix test_amphora_update using the unique load balancer" into mcp/caracal