kernel: backport fib_trie improvements/fixes from 4.0-rc