Fix deprecated twig block name
Merge branch 'sonata/master'