Merge remote-tracking branch 'cmaster-next' into cmaster-next-releng

diff --cc isisd/isis_circuit.c
Simple merge

diff --cc lib/nexthop.c
Simple merge

diff --cc vtysh/extract.pl.in
Simple merge

diff --cc zebra/zebra_rnh.c
Simple merge