BUG-731 : removed critical sonar warnings

Change-Id: Ic213c01c1c2ecbab3e4cd7cb7a6167713fe94a8c
Signed-off-by: Dana Kutenicsova <dkutenic@cisco.com>
Merge "BUG-731 : removed critical sonar warnings"