Merge remote-tracking branch 'origin/stable/3.0'

diff --cc bgpd/bgp_vty.c
Simple merge

diff --cc ospfd/ospf_vty.c
Simple merge

diff --cc pimd/pim_cmd.c
Simple merge