Bug fixes.

Change-Id: Ib5372bfe729c7406e4f9e03d391c7d3dcaffa0b5
Further changes for HA support (HSRP) in the agent
Merge remote-tracking branch 'cisco/bobmel/savvis_poc_n7k' into savvis_poc_n7k