From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Fri, 9 Oct 2020 23:38:38 +0000 (-0400)
Subject: Merge pull request #7243 from idryzhov/7.5-backports
X-Git-Tag: frr-7.5~11
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=58258d709c83f4a2b935654cc852bfce810205ac;p=mirror%2Ffrr.git

Merge pull request #7243 from idryzhov/7.5-backports

[7.5] backport all recent fixes
---

58258d709c83f4a2b935654cc852bfce810205ac