Removing cyclic dependency on spring-social-config-extension