Merge pull request #4966 from sartura/clamav_fix_build_issues