Fixed detection of generic types and qualifier annotations on scoped-proxy factory methods

Issue: SPR-11116
Polishing