Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into cmaster

diff --cc bgpd/bgp_bfd.c
Simple merge

diff --cc bgpd/bgp_route.c
Simple merge

diff --cc bgpd/bgp_vty.c
Simple merge

diff --cc bgpd/bgpd.c
Simple merge

diff --cc ospf6d/ospf6_area.c
Simple merge

diff --cc ospf6d/ospf6_interface.c
Simple merge

diff --cc ospfd/ospf_bfd.c
Simple merge

diff --cc zebra/rt_netlink.c
Simple merge

diff --cc zebra/zebra_rib.c
Simple merge

diff --cc zebra/zebra_rnh.c
Simple merge

diff --cc zebra/zebra_vty.c
Simple merge

diff --cc zebra/zserv.c
Simple merge