BUG-731 : more warnings down

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