BUG-731 : more sonar warnings fixed

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