ole2: code review changes and code cleanup
Merge branch 'master' of git.clam.sourcefire.com:/var/lib/git/clamav-devel