Merge pull request #3205 from donaldsharp/default

bgpd: make name of default vrf/bgp instance consistent

diff --cc bgpd/bgp_nexthop.c
Simple merge

diff --cc bgpd/bgp_route.c
Simple merge

diff --cc bgpd/bgp_vty.c
Simple merge