ATLAS-1685: fix for issues flagged by coverity scan

Signed-off-by: Madhan Neethiraj <madhan@apache.org>
10 files changed