Changes required for v2.0 of the FOSUserBundle