Merge pull request #8942 from ton31337/fix/cleanups_2

Another round of cleanup

diff --cc bgpd/bgp_nht.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 lib/prefix.c
Simple merge

diff --cc lib/zclient.c
Simple merge