Merge pull request #1618 from donaldsharp/zebra_startup_ordering

zebra route-leaking for static routes

diff --cc bgpd/rfapi/vnc_zebra.c
Simple merge

diff --cc lib/zclient.c
Simple merge

diff --cc lib/zclient.h
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_static.c
index 3dd5378f22a360b9eddf35df26d7b5974f852524,fa5f0d9c48b52307597521fa06c85ef5665e0a96..2e8ab11b040a7621a6a73a8a48332bb8fb8be756
--- 1/zebra/zebra_static.c
--- 2/zebra/zebra_static.c
+++ b/zebra/zebra_static.c
@@@ -155,8 -155,9 +155,9 @@@ void static_install_route(afi_t afi, sa
                re->metric = 0;
                re->mtu = 0;
                re->vrf_id = si->vrf_id;
+               re->nh_vrf_id = si->nh_vrf_id;
                re->table =
 -                      si->vrf_id
 +                      (si->vrf_id != VRF_DEFAULT)
                                ? (zebra_vrf_lookup_by_id(si->vrf_id))->table_id
                                : zebrad.rtm_table_default;
                re->nexthop_num = 0;

diff --cc zebra/zebra_vty.c
Simple merge

diff --cc zebra/zserv.c
Simple merge