tree f8cf79ab4cddad39135bef9dd72345d5eeb44879
parent 465a9b8ec238f5de291ae87c247978bc6682c56c
author sunish vk <sunish.vk@cognizant.com> 1466751583 +0530
committer sunish vk <sunish.vk@cognizant.com> 1466758697 +0530

ISIS protocol manual merge from 1.6 due to cherry pick merge conflict

Change-Id: I6c3abf6a83ddaeba76293dc7864fcec88e9b4e7e