BUG-731 : removed more sonar warnings

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