BUG-731: last warnings fixed

Change-Id: I649141d1c6209a2774a3dda2f3d6b3ab27217888
Signed-off-by: Dana Kutenicsova <dkutenic@cisco.com>
Merge "BUG-731: last warnings fixed"