Polish and changes to use single Spring Social configurer. SOCIAL-388