ole2/ooxml: fixed various build issues with libjson disabled
ole2: cleaned up macro usage
Merge branch 'master' of git.clam.sourcefire.com:/var/lib/git/clamav-devel