New storage ids and small fixes for files_antivirus

Mainly here is a port of patches from the  #1453 pull request.
Other fixes are minor things, like cleanup of the old stuff after upgrading.
@VicDeo please have a look