Unify vulnerability and security polices risk types

The following discussion from !215465 (merged) should be addressed: