fix regression with wrong parameter name
fix integration with new admin theme
Merge remote-tracking branch 'sonata-project/master'