Merge "Fix various Klocwork errors" into devel/master