Merge pull request #2945 from dslicenc/bgp-ospf-json

bgpd/ospfd: make bgp and ospf json response a bit more consistent

diff --cc bgpd/bgp_vty.c
Simple merge

diff --cc bgpd/bgpd.c
Simple merge

diff --cc lib/plist.c
Simple merge

diff --cc ospfd/ospf_vty.c
Simple merge