BUG-731 : removed more warnings

Change-Id: I82b253f3e11e8155ea7dae61ecd47906565cfcb7
Signed-off-by: Dana Kutenicsova <dkutenic@cisco.com>
Merge "BUG-731 : removed more warnings"