Merge "Bug 3615: Fib should be in operational datastore" into stable/lithium