BUG-731 : removed some sonar warnings

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