Added support for FOSUserBundle 1.3 and 2.x