Bug#981139: #981139 should be fixed downstream

[Pete Heist]

This should be the right fix to pull in. I'd also be glad to see it:

https://github.com/FRRouting/frr/pull/8876