Applied fixes from FlintCI (#5856)
Applied fixes from FlintCI (#5856)


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