Applied fixes from FlintCI (#5326)
Applied fixes from FlintCI (#5326)


sonata-project/SonataAdminBundle,greg0ire/SonataAdminBundle,sonata-project/SonataAdminBundle,ARTACK/SonataAdminBundle,peter-gribanov/SonataAdminBundle,peter-gribanov/SonataAdminBundle,osavchenko/SonataAdminBundle,jordisala1991/SonataAdminBundle,Armstrong1992/SonataAdminBundle,ARTACK/SonataAdminBundle,peter-gribanov/SonataAdminBundle,ARTACK/SonataAdminBundle,jordisala1991/SonataAdminBundle,ARTACK/SonataAdminBundle,jordisala1991/SonataAdminBundle,jordisala1991/SonataAdminBundle,peter-gribanov/SonataAdminBundle,osavchenko/SonataAdminBundle,osavchenko/SonataAdminBundle,osavchenko/SonataAdminBundle,Armstrong1992/SonataAdminBundle,greg0ire/SonataAdminBundle,greg0ire/SonataAdminBundle,osavchenko/SonataAdminBundle,greg0ire/SonataAdminBundle