Sync codebase with sonata-doctrine-orm-admin-bundle

Remaining, mostly mapping related