Merge "Add linkstate information to RIB"