Merge pull request #4269 from donaldsharp/other_tables

zebra Other tables

diff --cc zebra/redistribute.c
Simple merge

diff --cc zebra/zebra_rib.c
Simple merge

diff --cc zebra/zebra_router.c
Simple merge

diff --cc zebra/zebra_router.h
Simple merge

diff --cc zebra/zebra_vrf.c
Simple merge

diff --cc zebra/zebra_vrf.h
Simple merge