Merge remote-tracking branch 'origin/cmaster' into cmaster-next

diff --cc bgpd/bgp_nexthop.c
Simple merge

diff --cc ospfd/ospf_main.c
Simple merge

diff --cc vtysh/vtysh.c
Simple merge