Merge remote-tracking branch 'origin/cmaster' into cmaster-next

diff --cc bgpd/bgp_bfd.c
Simple merge

diff --cc bgpd/bgp_nht.c
Simple merge

diff --cc bgpd/bgp_zebra.c
Simple merge

diff --cc lib/nexthop.h
Simple merge