Merge "[bgpvpn] Extend delete scenarious" into mcp/epoxy