* Composite nexthop changes to make list of component nh's
  as key, test case changes for same

Change-Id: Id4f2f07c25394464c14d07f0cc9816c353aa382b
Merge "* Composite nexthop changes to make list of component nh's   as key, test case changes for same"