AbstractBeanFactory removes alreadyCreated entry after bean creation failure

Issue: SPR-10896
(cherry picked from commit e213561)
EhCacheFactoryBean calls addCache after listener registration

Issue: SPR-10904
(cherry picked from commit a3df311)