From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Wed, 28 Oct 2020 23:28:51 +0000 (-0400)
Subject: Merge pull request #7407 from idryzhov/7.5-backports
X-Git-Tag: frr-7.5~4
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=881caa1980d712d16bd053dcbf57e9e7c31c32b4;p=matthieu%2Ffrr.git

Merge pull request #7407 from idryzhov/7.5-backports

[7.5] backport recent fixes
---

881caa1980d712d16bd053dcbf57e9e7c31c32b4