Merge branch 'pull/3197'

...with a nit fix

Signed-off-by: David Lamparter <equinox@diac24.net>

diff --cc bgpd/bgp_lcommunity.c
Simple merge

diff --cc bgpd/bgpd.c
Simple merge

diff --cc lib/routemap.c
Simple merge

diff --cc ospfd/ospf_sr.c
Simple merge