Bug-731: fixed segment-routing sonar issues.

Change-Id: Ie6e120f38ebf036fc09cb601d9c46a572cdffe7e
Signed-off-by: Milos Fabian <milfabia@cisco.com>
Merge "Bug-731: fixed segment-routing sonar issues."