Merge remote-tracking branch 'origin/master' into mpls2

diff --cc bgpd/bgp_main.c
Simple merge

diff --cc bgpd/bgp_route.c
Simple merge

diff --cc configure.ac
Simple merge

diff --cc lib/zclient.c
Simple merge

diff --cc vtysh/vtysh.c
Simple merge