Merge pull request #1044 from donaldsharp/combination

Coverity Cleanup of Stuff

diff --cc bgpd/bgp_evpn.c
Simple merge

diff --cc bgpd/bgp_route.c
Simple merge

diff --cc eigrpd/eigrp_interface.c
Simple merge

diff --cc eigrpd/eigrp_vty.c
Simple merge

diff --cc ospf6d/ospf6_zebra.c
Simple merge

diff --cc ospfd/ospf_vty.c
Simple merge

diff --cc zebra/if_netlink.c
Simple merge

diff --cc zebra/interface.c
Simple merge

diff --cc zebra/ioctl.c
Simple merge

diff --cc zebra/redistribute.c
Simple merge

diff --cc zebra/rt_netlink.c
Simple merge

diff --cc zebra/zebra_rib.c
Simple merge

diff --cc zebra/zebra_vty.c
Simple merge

diff --cc zebra/zebra_vxlan.c
Simple merge

diff --cc zebra/zserv.c
Simple merge