GenericBeanDefinition's toString() takes parent definition into account

Issue: SPR-9671
Test for overriding singleton @Bean method with scoped proxy in configuration subclass

Issue: SPR-10744