* Change tunnel type field in composite NH key maintained in
  agent path.
* Test case to verify that ecmp composite NH gets properly updated
  upon tunnel type change.

Change-Id: I7d4bc5de56c493d79c9620b6b1212f563bb5cd7c
(cherry picked from commit 4f3caeb46b782337a21b3d4fdfb585bae47e0661)
Merge "* Change tunnel type field in composite NH key maintained in   agent path. * Test case to verify that ecmp composite NH gets properly updated   upon tunnel type change." into R1.10