GenericBeanDefinition's toString() takes parent definition into account

Issue: SPR-9671
(cherry picked from commit 0ef29b2)
Test for overriding singleton @Bean method with scoped proxy in configuration subclass

Issue: SPR-10744
(cherry picked from commit 299776f)
Test for base package specified as config location

Issue: SPR-11647
(cherry picked from commit 8e6e6c2)
AspectJExpressionPointcut defensively handles fallback expression parsing

Issue: SPR-9335
(cherry picked from commit ce4912b)
Revised @PropertySource parsing for consistent PropertySource naming, avoiding accidental overriding by name

Issue: SPR-11637
(cherry picked from commit ab24dda)
Polishing
(cherry picked from commit be5f2a8)