adds new discovery_method labels
fixes consistency between veris enumerations and veris labels.
Merge branch 'master' of github.com:vz-risk/veris