2457: Rename phpunit.xml to phpunit.xml.dist and add to gitignore
Merge branch 'bugfix-2457' into 2.x