Merge branch 'frr/pull/569'

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

diff --cc bgpd/bgp_encap.c
Simple merge

diff --cc bgpd/bgp_evpn_vty.c
Simple merge

diff --cc bgpd/bgp_mplsvpn.c
Simple merge

diff --cc bgpd/bgp_route.c
Simple merge

diff --cc bgpd/bgp_route.h
Simple merge