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

diff --cc bgpd/bgp_updgrp_packet.c
index 02979602bf74fd2bef0df1e4fad2d851a59ecf13,fe60fc3fb8c7486c0c05e5a1a839e9944abc81f8..8839de391e12d5beabefe063ab5a6f58706a17ec
--- 1/bgpd/bgp_updgrp_packet.c
--- 2/bgpd/bgp_updgrp_packet.c
+++ b/bgpd/bgp_updgrp_packet.c
@@@ -618,9 -617,10 +618,11 @@@ static voi
  bgp_info_addpath_tx_str (int addpath_encode, u_int32_t addpath_tx_id,
                           char *buf)
  {
 +  buf[0] = '\0';
    if (addpath_encode)
      sprintf(buf, " with addpath ID %d", addpath_tx_id);
+   else
+     buf[0] = '\0';
  }
  
  /* Make BGP update packet.  */

diff --cc isisd/isis_circuit.c
Simple merge

diff --cc isisd/isis_lsp.c
Simple merge

diff --cc isisd/isis_pdu.c
Simple merge

diff --cc isisd/isis_route.c
Simple merge

diff --cc isisd/isis_te.c
Simple merge

diff --cc lib/log.c
Simple merge

diff --cc vtysh/vtysh.c
Simple merge

diff --cc zebra/zserv.c
Simple merge