fix clamav paths and enable for all sites
Merge remote branch 'upstream/master'