Make all @Bean methods public

Fixes gh-1571
Merge branch '1.1.x'