CDI-83, Move getAnnotatedType(s) to ABD
CDI-58, remove IdentifiedAnnotatedType