handle @Extra after @Bean
Merge pull request #1095 from dodgex/ExtrasAfterBean

Handle @Extra after @Bean