BUG-611 : cleaned up NextHop parsing/serializing.

Change-Id: I6d162d6665721a6574a00f6125b679dbf43d902d
Signed-off-by: Dana Kutenicsova <dkutenic@cisco.com>