Merge remote-tracking branch 'origin/master' into evpn_plus_struct_attr

diff --cc bgpd/bgp_debug.c
Simple merge

diff --cc bgpd/bgp_route.c
Simple merge

diff --cc bgpd/bgp_routemap.c
Simple merge

diff --cc bgpd/bgp_vty.c
Simple merge

diff --cc bgpd/bgp_zebra.c
Simple merge

diff --cc bgpd/bgpd.c
Simple merge

diff --cc bgpd/rfapi/rfapi.c
Simple merge

diff --cc bgpd/rfapi/rfapi_vty.c
Simple merge

diff --cc lib/command.c
Simple merge

diff --cc lib/command.h
Simple merge

diff --cc lib/vty.c
Simple merge

diff --cc vtysh/vtysh.c
Simple merge

diff --cc zebra/Makefile.am
Simple merge

diff --cc zebra/debug.c
index 0b0a0e9886f5c83d1dee2d5e99a0948c93484039,b570854641441eab7c07da523ec8ca5cf2cd7ce9..dd1c5d782869bd9e7a9a0afdea83f750f42b8710
--- 1/zebra/debug.c
--- 2/zebra/debug.c
+++ b/zebra/debug.c
@@@ -119,20 -118,9 +119,20 @@@ DEFUN (debug_zebra_mpls
         "Debug option set for zebra MPLS LSPs\n")
  {
    zebra_debug_mpls = ZEBRA_DEBUG_MPLS;
-   return CMD_WARNING;
+   return CMD_WARNING_CONFIG_FAILED;
  }
  
 +DEFUN (debug_zebra_vxlan,
 +       debug_zebra_vxlan_cmd,
 +       "debug zebra vxlan",
 +       DEBUG_STR
 +       "Zebra configuration\n"
 +       "Debug option set for zebra VxLAN (EVPN)\n")
 +{
 +  zebra_debug_vxlan = ZEBRA_DEBUG_VXLAN;
 +  return CMD_WARNING;
 +}
 +
  DEFUN (debug_zebra_packet,
         debug_zebra_packet_cmd,
         "debug zebra packet [<recv|send>] [detail]",

diff --cc zebra/interface.c
Simple merge

diff --cc zebra/rt_netlink.c
Simple merge

diff --cc zebra/rt_socket.c
Simple merge

diff --cc zebra/zebra_vty.c
Simple merge

diff --cc zebra/zserv.c
Simple merge