Merge branch 'master' into moreafisafi

diff --cc bgpd/bgp_routemap.c
Simple merge

diff --cc bgpd/bgp_vty.c
Simple merge

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

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