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

diff --cc lib/privs.c
Simple merge

diff --cc nhrpd/nhrp_vty.c
Simple merge

diff --cc ospf6d/ospf6_intra.c
Simple merge

diff --cc ospfd/ospf_abr.c
Simple merge

diff --cc ospfd/ospf_interface.c
Simple merge

diff --cc ospfd/ospf_interface.h
Simple merge

diff --cc ospfd/ospf_vty.c
Simple merge

diff --cc ospfd/ospf_vty.h
Simple merge

diff --cc ospfd/ospfd.c
Simple merge

diff --cc ospfd/ospfd.h
Simple merge