Merge branch 'master' into evpn-session-vrf

diff --cc bgpd/bgp_evpn.c
Simple merge

diff --cc bgpd/bgp_evpn.h
Simple merge

diff --cc bgpd/bgp_evpn_vty.c
Simple merge

diff --cc bgpd/bgp_main.c
Simple merge

diff --cc bgpd/bgp_zebra.c
Simple merge

diff --cc bgpd/bgpd.c
Simple merge

diff --cc bgpd/bgpd.h
Simple merge

diff --cc zebra/zebra_router.h
index a60a0b7be9aeac6d705b111e2e901fd5abe4ae81,61f2902233114ca3ce8116aa253d47f3f1729227..72b5e9b9b1e0088c392268f7fe8eb301a2fed031
--- 1/zebra/zebra_router.h
--- 2/zebra/zebra_router.h
+++ b/zebra/zebra_router.h
@@@ -133,13 -134,8 +139,18 @@@ extern void zebra_router_show_table_sum
  
  extern uint32_t zebra_router_get_next_sequence(void);
  
 +static inline vrf_id_t zebra_vrf_get_evpn_id(void)
 +{
 +      return zrouter.evpn_vrf ? zvrf_id(zrouter.evpn_vrf) : VRF_DEFAULT;
 +}
 +static inline struct zebra_vrf *zebra_vrf_get_evpn(void)
 +{
 +      return zrouter.evpn_vrf ? zrouter.evpn_vrf
 +                              : zebra_vrf_lookup_by_id(VRF_DEFAULT);
 +}
++
+ #ifdef __cplusplus
+ }
+ #endif
+ 
  #endif

diff --cc zebra/zebra_vrf.h
Simple merge

diff --cc zebra/zebra_vty.c
Simple merge

diff --cc zebra/zebra_vxlan.c
Simple merge

diff --cc zebra/zebra_vxlan.h
Simple merge