7133238: Merge proto-kind and proto-type into a single result class Summary: Restructure attribution code so that the check-logic can be encapsulated into a single class Reviewed-by: jjg, dlsmith

^build/
^dist/
/nbproject/private/
^webrev
^.hgtip