bz11022 fix optparser name collisions for Mac OS X.
Merge branch 'master' of git.clam.sourcefire.com:/var/lib/git/clamav-devel
ole2: fixed an issue with extremely long names
bb#11028 - fixed a deadlock issue with fanotify and logg_mutex
Merge branch 'master' into always-on-json