[AMOS commit] MDL-20636 Fix some more codechecker issues. Committed into Git: 2011-05-14 21:53 UTC