Closes #584 by adding the 3 vulnerability mappings.
Closes #542 by moving scan.deleting = true
Merge commit '39ed3c452512831e2c8157415f8072f2e339caa3' into HEAD