Merge pull request #7478 from donaldsharp/buffer

Buffer

diff --cc bgpd/bgp_nht.c
Simple merge

diff --cc bgpd/bgp_zebra.c
Simple merge

diff --cc lib/bfd.c
Simple merge

diff --cc lib/zclient.h
Simple merge

diff --cc ospf6d/ospf6_zebra.c
Simple merge

diff --cc ospfd/ospf_zebra.c
Simple merge