Merge "Unset "router:external" in subnet tests" into mcp/caracal