Merge branch 'master' into cleanup

diff --cc bgpd/bgp_attr.c
Simple merge

diff --cc bgpd/bgp_route.c
Simple merge

diff --cc bgpd/bgp_vty.c
Simple merge

diff --cc bgpd/bgpd.h
Simple merge

diff --cc configure.ac
Simple merge

diff --cc isisd/isis_lsp.c
Simple merge

diff --cc lib/vty.c
Simple merge