Merge branch 'stable/2.0'

diff --cc bgpd/bgpd.c
Simple merge

diff --cc ospfd/ospf_bfd.c
Simple merge

diff --cc ospfd/ospf_vty.c
Simple merge

diff --cc pimd/pim_vty.c
Simple merge

diff --cc zebra/interface.c
Simple merge