Merge branch 'kselftests-fib_rule_tests-fix'