Merge pull request #8056 from jmmikkel/peertype

bgpd: Add "bgp bestpath peer-type multipath-relax"

diff --cc bgpd/bgp_route.c
Simple merge

diff --cc bgpd/bgp_vty.c
Simple merge

diff --cc bgpd/bgp_zebra.c
Simple merge

diff --cc bgpd/bgpd.h
Simple merge

diff --cc doc/user/bgp.rst
Simple merge