Merge remote-tracking branch 'origin/stable/3.0'

diff --cc bgpd/bgp_attr.c
Simple merge

diff --cc bgpd/bgp_encap.c
Simple merge

diff --cc bgpd/bgp_mplsvpn.c
Simple merge

diff --cc bgpd/bgp_route.c
Simple merge