Merge branch 'master' of https://github.com/dwalton76/frr into bgpd-ipv4-plus-label...

diff --cc bgpd/bgp_attr.c
Simple merge

diff --cc bgpd/bgp_packet.c
Simple merge

diff --cc bgpd/bgp_vty.c
Simple merge

diff --cc bgpd/bgpd.h
Simple merge

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