Fix XSS issue reported by https://github.com/sonata-project/SonataAdminBundle/pull/1173
Merge branch '2.1'