Merge branch 'net-add-struct-nexthop-to-fib-info'