Merge branch 'master' into type5-default-originate

diff --cc bgpd/bgp_evpn.c
Simple merge

diff --cc bgpd/bgp_evpn.h
Simple merge

diff --cc bgpd/bgp_evpn_private.h
Simple merge

diff --cc bgpd/bgp_evpn_vty.c
Simple merge

diff --cc bgpd/bgpd.h
index 274ca82ffcdfb14e6efb1deef65fc54d4850203f,91a9f11620c76dd79a092142efc0d2b10aa8204f..bc5350ce24fb55118dedeab3662837d442e274de
--- 1/bgpd/bgpd.h
--- 2/bgpd/bgpd.h
+++ b/bgpd/bgpd.h
@@@ -438,9 -431,12 +438,11 @@@ struct bgp 
        /* vrf flags */
        uint32_t vrf_flags;
  #define BGP_VRF_AUTO                        (1 << 0)
 -#define BGP_VRF_ADVERTISE_IPV4_IN_EVPN      (1 << 1)
 -#define BGP_VRF_ADVERTISE_IPV6_IN_EVPN      (1 << 2)
 -#define BGP_VRF_IMPORT_RT_CFGD              (1 << 3)
 -#define BGP_VRF_EXPORT_RT_CFGD              (1 << 4)
 -#define BGP_VRF_RD_CFGD                     (1 << 5)
 -#define BGP_VRF_L3VNI_PREFIX_ROUTES_ONLY    (1 << 6)
 +#define BGP_VRF_IMPORT_RT_CFGD              (1 << 1)
 +#define BGP_VRF_EXPORT_RT_CFGD              (1 << 2)
 +#define BGP_VRF_RD_CFGD                     (1 << 3)
++#define BGP_VRF_L3VNI_PREFIX_ROUTES_ONLY    (1 << 4)
++
  
        /* unique ID for auto derivation of RD for this vrf */
        uint16_t vrf_rd_id;