update code-coverage-common constraint; rollback phpunit/phpunit version
Merge remote-tracking branch 'origin/2.5'

Conflicts:
	composer.lock