Fixed type detection to avoid reuse of parent bean's targetType on child definition merge

Issue: SPR-10374
(cherry picked from commit 070103b)
Polishing
Further changelog entries for 3.2.3