tree b65296f34fa7b41ef8c1f7781a113241901d9fb5
parent b977f56ac25576cbe58f0ed812234134659695b2
author sunishvk <sunish.vk@cognizant.com> 1468837959 +0530
committer Gerrit Code Review <gerrit@onlab.us> 1469553970 +0000

OSPF protocol manual merge from 1.6, due to cherry pick merge conflict

Change-Id: I93653e745468722ce95533537a79e897b4292f5d