Fix ant test to use composer's phpunit.
Merge branch 'develop' into media_type