Sonata User bundle fix to be usable with FOS:UserBundle 2.x

These two fixes allow SonataUserBundle be used with FOS:UserBundle 2.x