Revert "Merge branch 'krajagopalan_coverity-fixes' into 'develop'"

This reverts merge request !10