Merge "Wait for router interface removal before remove router" into mcp/caracal