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

diff --cc bgpd/bgp_fsm.c
Simple merge

diff --cc bgpd/bgp_vty.c
Simple merge

diff --cc bgpd/bgpd.c
Simple merge

diff --cc doc/Building_FRR_on_Ubuntu1604.md
index 09b5aa8b72cbf9bec8417accf46e296446f3a8c5,2d5b57ed56e2b5d1bcbde04fcbe060218b461e6f..9aa3206feeef0b88803868106e04c62fb75d883c
--- 1/doc/Building_FRR_on_Ubuntu1604.md
--- 2/doc/Building_FRR_on_Ubuntu1604.md
+++ b/doc/Building_FRR_on_Ubuntu1604.md
@@@ -119,8 -119,8 +119,8 @@@ Add the following lines to `/etc/module
      sudo install -m 644 tools/frr.service /etc/systemd/system/frr.service  
      sudo install -m 644 cumulus/etc/default/frr /etc/default/frr  
      sudo install -m 644 cumulus/etc/frr/daemons /etc/frr/daemons  
-     sudo install -m 644 cumulus/etc/frr/daemons.conf /etc/frr/daemons.conf  
-     sudo install -m 644 cumulus/etc/frr/Frr.conf /etc/frr/Frr.conf  
 -    sudo install -m 644 cumulus/etc/frr/debian.conf /etc/frr/debian.conf  
 -    sudo install -m 644 cumulus/etc/frr/frr.conf /etc/frr/frr.conf  
++    sudo install -m 644 tools/etc/frr/daemons.conf /etc/frr/daemons.conf
++    sudo install -m 644 tools/etc/frr/frr.conf /etc/frr/frr.conf
      sudo install -m 644 -o frr -g frr cumulus/etc/frr/vtysh.conf /etc/frr/vtysh.conf   
  
  ### Enable daemons 

diff --cc ospf6d/ospf6_lsa.c
index 36c3d825c522d4598b4e05ce3f00c3c31560ca07,867dc3d9d83bd243a85e51fb700c3d022f447939..acc8fe38040932b35b1884be043cd53dcece2baf
--- 1/ospf6d/ospf6_lsa.c
--- 2/ospf6d/ospf6_lsa.c
+++ b/ospf6d/ospf6_lsa.c
@@@ -917,7 -936,26 +916,6 @@@ DEFUN (no_debug_ospf6_lsa_type
    return CMD_SUCCESS;
  }
  
 -ALIAS (no_debug_ospf6_lsa_type,
 -       no_debug_ospf6_lsa_hex_detail_cmd,
 -       "no debug ospf6 lsa (router|network|inter-prefix|inter-router|as-external|link|intra-prefix|unknown) (originate|examine|flooding)",
 -       NO_STR
 -       DEBUG_STR
 -       OSPF6_STR
 -       "Debug Link State Advertisements (LSAs)\n"
 -       "Router LSA's\n"
 -       "Network LSA's\n"
 -       "Inter-Prefix LSA's\n"
 -       "Inter-Router LSA's\n"
 -       "AS-External LSA's\n"
 -       "Link LSA's\n"
 -       "Intra-Prefix LSA's\n"
 -       "Unknown LSA's\n"
 -       "Originate\n"
 -       "Examine\n"
 -       "Flooding\n"
 -      )
--
  void
  install_element_ospf6_debug_lsa (void)
  {