From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Sat, 10 Oct 2020 13:46:16 +0000 (-0400)
Subject: Merge pull request #7275 from idryzhov/7.5-more-backports
X-Git-Tag: frr-7.5~10
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=632bc6e654044d9e645914cf2d6d75a73bdacef0;p=mirror%2Ffrr.git

Merge pull request #7275 from idryzhov/7.5-more-backports

[7.5] more fixes backports
---

632bc6e654044d9e645914cf2d6d75a73bdacef0