Merged Spring Social security configurers into a single configurer. SOCIAL-388