Merge pull request #9676 from donaldsharp/import_register

diff --cc bgpd/bgp_zebra.c
Simple merge

diff --cc zebra/zapi_msg.c
Simple merge

diff --cc zebra/zebra_vrf.c
Simple merge

diff --cc zebra/zebra_vrf.h
Simple merge

diff --cc zebra/zebra_vty.c
Simple merge